Base: More code cleanup and fixes

src/Config.cpp

@@ -1,7 +1,6 @@
 #include <obs-frontend-api.h>
 
 #include "Config.h"
-#include "plugin-macros.generated.h"
 #include "utils/Crypto.h"
 #include "utils/Platform.h"
 

src/Config.h

@@ -3,6 +3,8 @@
 #include <QString>
 #include <util/config-file.h>
 
+#include "plugin-macros.generated.h"
+
 class Config {
 	public:
 		Config();

src/WebSocketServer.cpp

@@ -11,7 +11,6 @@
 #include "Config.h"
 #include "utils/Crypto.h"
 #include "utils/Platform.h"
-#include "plugin-macros.generated.h"
 
 WebSocketServer::WebSocketServer() :
 	QObject(nullptr),

src/WebSocketServer.h

@@ -9,6 +9,7 @@
 
 #include "utils/Json.h"
 #include "WebSocketSession.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketServer : QObject
 {

src/WebSocketServer_Protocol.cpp

@@ -6,9 +6,7 @@
 #include "eventhandler/EventHandler.h"
 #include "obs-websocket.h"
 #include "Config.h"
-#include "plugin-macros.generated.h"
 #include "utils/Crypto.h"
-#include "utils/Json.h"
 #include "utils/Platform.h"
 
 namespace WebSocketOpCode {

src/WebSocketSession.cpp

@@ -1,6 +1,5 @@
 #include "WebSocketSession.h"
 #include "eventhandler/types/EventSubscription.h"
-#include "plugin-macros.generated.h"
 
 WebSocketSession::WebSocketSession() :
 	_remoteAddress(""),

src/WebSocketSession.h

@@ -5,6 +5,8 @@
 #include <atomic>
 #include <memory>
 
+#include "plugin-macros.generated.h"
+
 class WebSocketSession;
 typedef std::shared_ptr<WebSocketSession> SessionPtr;
 

src/eventhandler/EventHandler.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 EventHandler::EventHandler() :
 	_obsLoaded(false),

src/eventhandler/EventHandler.h

@@ -8,6 +8,7 @@
 #include "types/EventSubscription.h"
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
+#include "../plugin-macros.generated.h"
 
 template <typename T> T* GetCalldataPointer(const calldata_t *data, const char* name) {
 	void *ptr = nullptr;
@@ -40,7 +41,7 @@ class EventHandler
 		void ConnectSourceSignals(obs_source_t *source);
 		void DisconnectSourceSignals(obs_source_t *source);
 
-		void BroadcastEvent(uint64_t requiredIntent, std::string eventType, json eventData = nullptr, uint8_t rpcVersion = 1);
+		void BroadcastEvent(uint64_t requiredIntent, std::string eventType, json eventData = nullptr, uint8_t rpcVersion = 0);
 
 		// Signal handler: frontend
 		static void OnFrontendEvent(enum obs_frontend_event event, void *private_data);

src/eventhandler/EventHandler_Config.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleCurrentSceneCollectionChanged()
 {

src/eventhandler/EventHandler_Filters.cpp

@@ -1,2 +1 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"

src/eventhandler/EventHandler_General.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleExitStarted()
 {

src/eventhandler/EventHandler_Inputs.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleInputCreated(obs_source_t *source)
 {

src/eventhandler/EventHandler_MediaInputs.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 #define CASE(x) case x: return #x;
 

src/eventhandler/EventHandler_Outputs.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 #define CASE(x) case x: return #x;
 

src/eventhandler/EventHandler_SceneItems.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleSceneItemCreated(void *param, calldata_t *data)
 {

src/eventhandler/EventHandler_Scenes.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleSceneCreated(obs_source_t *source)
 {

src/eventhandler/EventHandler_Transitions.cpp

@@ -1,5 +1,4 @@
 #include "EventHandler.h"
-#include "../plugin-macros.generated.h"
 
 void EventHandler::HandleTransitionCreated(obs_source_t *source)
 {

src/forms/ConnectInfo.cpp

@@ -8,7 +8,6 @@
 #include "../obs-websocket.h"
 #include "../Config.h"
 #include "../utils/Platform.h"
-#include "../plugin-macros.generated.h"
 
 ConnectInfo::ConnectInfo(QWidget* parent) :
 	QDialog(parent, Qt::Dialog),

src/forms/ConnectInfo.h

@@ -2,6 +2,8 @@
 
 #include <QtWidgets/QDialog>
 
+#include "../plugin-macros.generated.h"
+
 #include "ui_ConnectInfo.h"
 
 class ConnectInfo : public QDialog

src/forms/SettingsDialog.cpp

@@ -9,7 +9,6 @@
 #include "../Config.h"
 #include "../WebSocketServer.h"
 #include "../utils/Crypto.h"
-#include "../plugin-macros.generated.h"
 
 QString GetToolTipIconHtml()
 {

src/forms/SettingsDialog.h

@@ -3,8 +3,10 @@
 #include <QDialog>
 #include <QTimer>
 
-#include "ui_SettingsDialog.h"
 #include "ConnectInfo.h"
+#include "../plugin-macros.generated.h"
+
+#include "ui_SettingsDialog.h"
 
 class SettingsDialog : public QDialog
 {

src/obs-websocket.cpp

@@ -6,7 +6,6 @@
 #include <obs-data.h>
 #include <obs-frontend-api.h>
 
-#include "plugin-macros.generated.h"
 #include "obs-websocket.h"
 #include "Config.h"
 #include "WebSocketServer.h"
@@ -34,8 +33,7 @@ void ___properties_dummy_addref(obs_properties_t*) {};
 bool obs_module_load(void)
 {
 	blog(LOG_INFO, "[obs_module_load] you can haz websockets (Version: %s | RPC Version: %d)", OBS_WEBSOCKET_VERSION, OBS_WEBSOCKET_RPC_VERSION);
-	blog(LOG_INFO, "[obs_module_load] Qt version (compile-time): %s | Qt version (run-time): %s",
+	blog(LOG_INFO, "[obs_module_load] Qt version (compile-time): %s | Qt version (run-time): %s", QT_VERSION_STR, qVersion());
-		QT_VERSION_STR, qVersion());
 
 	// Randomize the random number generator
 	qsrand(QTime::currentTime().msec());

src/obs-websocket.h

@@ -10,6 +10,8 @@
     #pragma pop_macro("strtoll")
 #endif
 
+#include "plugin-macros.generated.h"
+
 // Autorelease object definitions
 void ___source_dummy_addref(obs_source_t*);
 void ___sceneitem_dummy_addref(obs_sceneitem_t*);

src/requesthandler/RequestHandler.cpp

@@ -1,5 +1,4 @@
 #include "RequestHandler.h"
-#include "../plugin-macros.generated.h"
 
 const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
 {

src/requesthandler/RequestHandler_General.cpp

@@ -1,9 +1,9 @@
 #include <QImageWriter>
 
 #include "RequestHandler.h"
+#include "../WebSocketServer.h"
 #include "../eventhandler/types/EventSubscription.h"
 #include "../obs-websocket.h"
-#include "../WebSocketServer.h"
 
 RequestResult RequestHandler::GetVersion(const Request& request)
 {