general: refactor qt includes

src/Config.cpp

@@ -19,8 +19,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 #include <util/config-file.h>
 
-#include <QCryptographicHash>
+#include <QtCore/QCryptographicHash>
-#include <QTime>
+#include <QtCore/QTime>
 
 #define SECTION_NAME "WebsocketAPI"
 #define PARAM_ENABLE "ServerEnabled"

src/Config.h

@@ -18,8 +18,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 class Config;
 typedef QSharedPointer<Config> ConfigPtr;

src/Utils.cpp

@@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include <QDir>
+#include <QtCore/QDir>
-#include <QUrl>
+#include <QtCore/QUrl>
+
 #include <obs-frontend-api.h>
 #include <obs.hpp>
 #include "obs-websocket.h"

src/Utils.h

@@ -20,11 +20,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <stdio.h>
 
-#include <QSpinBox>
+#include <QtCore/QString>
-#include <QPushButton>
+#include <QtWidgets/QSpinBox>
-#include <QLayout>
+#include <QtWidgets/QPushButton>
-#include <QListWidget>
+#include <QtWidgets/QLayout>
-#include <QSystemTrayIcon>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QSystemTrayIcon>
 
 #include <obs.hpp>
 #include <obs-module.h>

src/WSEvents.cpp

@@ -19,7 +19,7 @@
 
 #include <util/platform.h>
 
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 
 #include "Config.h"
 #include "Utils.h"

src/WSEvents.h

@@ -22,8 +22,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs.hpp>
 #include <obs-frontend-api.h>
 
-#include <QListWidgetItem>
+#include <QtWidgets/QListWidgetItem>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 
 #include "WSServer.h"

src/WSRequestHandler.h

@@ -19,9 +19,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
-#include <QSet>
+#include <QtCore/QSet>
-#include <QVariantHash>
+#include <QtCore/QVariantHash>
+#include <QtCore/QString>
 
 #include <obs.hpp>
 #include <obs-frontend-api.h>

src/WSRequestHandler_General.cpp

@@ -1,5 +1,3 @@
-#include <QString>
-
 #include "Config.h"
 #include "Utils.h"
 #include "WSEvents.h"

src/WSRequestHandler_Profiles.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_Recording.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_ReplayBuffer.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_SceneCollections.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_SceneItems.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_Scenes.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_Sources.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_Streaming.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 #include "WSEvents.h"
 

src/WSRequestHandler_StudioMode.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSRequestHandler_Transitions.cpp

@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"

src/WSServer.cpp

@@ -18,8 +18,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QtCore/QThread>
 #include <QtCore/QByteArray>
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtConcurrent/QtConcurrent>
 #include <obs-frontend-api.h>
 

src/WSServer.h

@@ -18,10 +18,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
-#include <QMutex>
+#include <QtCore/QMutex>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
-#include <QVariantHash>
+#include <QtCore/QVariantHash>
 
 #include <map>
 #include <set>

src/forms/settings-dialog.h

@@ -18,7 +18,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "ui_settings-dialog.h"
 

src/obs-websocket.cpp

@@ -18,9 +18,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-module.h>
 #include <obs-frontend-api.h>
-#include <QAction>
+
-#include <QMainWindow>
+#include <QtCore/QTimer>
-#include <QTimer>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
 
 #include "obs-websocket.h"
 #include "WSServer.h"