base: Dumb #include redefinitions

src/Config.cpp

@@ -1,10 +1,10 @@
 #include <QTime>
 #include <obs-frontend-api.h>
 
-#include "plugin-macros.generated.h"
-
 #include "Config.h"
 
+#include "plugin-macros.generated.h"
+
 #define CONFIG_SECTION_NAME "OBSWebSocket"
 
 #define PARAM_ENABLED "ServerEnabled"

src/WebSocketServer.cpp

@@ -1,12 +1,12 @@
 #include <QtConcurrent>
 
-#include "plugin-macros.generated.h"
-
 #include "WebSocketServer.h"
 #include "obs-websocket.h"
 #include "Config.h"
 #include "requesthandler/RequestHandler.h"
 
+#include "plugin-macros.generated.h"
+
 WebSocketServer::WebSocketServer() :
 	QObject(nullptr),
 	_sessionMutex(QMutex::Recursive),
@@ -35,7 +35,7 @@ WebSocketServer::WebSocketServer() :
 		)
 	);
 
-	blog(LOG_INFO, "test");
+	blog(LOG_INFO, "cocks");
 }
 
 WebSocketServer::~WebSocketServer()

src/WebSocketSession.cpp

@@ -1,7 +1,7 @@
-#include "plugin-macros.generated.h"
-
 #include "WebSocketSession.h"
 
+#include "plugin-macros.generated.h"
+
 WebSocketSession::WebSocketSession() :
 	incomingMessages(0),
 	outgoingMessages(0),

src/forms/SettingsDialog.cpp

@@ -4,13 +4,13 @@
 #include <QClipboard>
 #include <QTime>
 
-#include "../plugin-macros.generated.h"
-
 #include "SettingsDialog.h"
 #include "../obs-websocket.h"
 #include "../Config.h"
 #include "../WebSocketServer.h"
 
+#include "../plugin-macros.generated.h"
+
 SettingsDialog::SettingsDialog(QWidget* parent) :
 	QDialog(parent, Qt::Dialog),
 	ui(new Ui::SettingsDialog)

src/obs-websocket.cpp

@@ -6,13 +6,13 @@
 #include <QtWidgets/QAction>
 #include <QtWidgets/QMainWindow>
 
-#include "plugin-macros.generated.h"
-
 #include "obs-websocket.h"
 #include "Config.h"
 #include "WebSocketServer.h"
 #include "forms/SettingsDialog.h"
 
+#include "plugin-macros.generated.h"
+
 // Auto release definitions
 void ___source_dummy_addref(obs_source_t*) {}
 void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}

src/plugin-macros.generated.h

@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-#ifndef PLUGINNAME_H
+#pragma once
-#define PLUGINNAME_H
 
 #define OBS_WEBSOCKET_VERSION "5.0.0"
 
@@ -26,5 +25,3 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #define QT_TO_UTF8(str) str.toUtf8().constData()
 
 #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
-
-#endif

src/plugin-macros.h.in

@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-#ifndef PLUGINNAME_H
+#pragma once
-#define PLUGINNAME_H
 
 #define OBS_WEBSOCKET_VERSION "@CMAKE_PROJECT_VERSION@"
 
@@ -26,5 +25,3 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #define QT_TO_UTF8(str) str.toUtf8().constData()
 
 #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
-
-#endif

src/requesthandler/RequestHandler.cpp

@@ -1,3 +1,3 @@
-#include "../plugin-macros.generated.h"
-
 #include "RequestHandler.h"
+
+#include "../plugin-macros.generated.h"

src/requesthandler/rpc/Request.cpp

@@ -1,3 +1,3 @@
-#include "../../plugin-macros.generated.h"
-
 #include "Request.h"
+
+#include "../../plugin-macros.generated.h"

src/requesthandler/rpc/RequestResult.cpp

@@ -1,3 +1,3 @@
-#include "../../plugin-macros.generated.h"
-
 #include "RequestResult.h"
+
+#include "../../plugin-macros.generated.h"

src/utils/JsonUtils.cpp

@@ -1,7 +1,8 @@
+#include "Utils.h"
 // For AutoRelease types
 #include "../obs-websocket.h"
 
-#include "Utils.h"
+#include "../plugin-macros.generated.h"
 
 bool Utils::Json::JsonArrayIsValidObsArray(json j)
 {