From 93adc8587d81e07f5c1de084b15f8d7fa838d801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lepin?= <stephane.lepin@gmail.com>
Date: Thu, 18 Apr 2019 13:17:24 +0200
Subject: [PATCH] general: refactor qt includes

---
 src/Config.cpp                            |  4 ++--
 src/Config.h                              |  4 ++--
 src/Utils.cpp                             |  7 ++++---
 src/Utils.h                               | 11 ++++++-----
 src/WSEvents.cpp                          |  2 +-
 src/WSEvents.h                            |  4 ++--
 src/WSRequestHandler.h                    |  7 ++++---
 src/WSRequestHandler_General.cpp          |  2 --
 src/WSRequestHandler_Profiles.cpp         |  1 -
 src/WSRequestHandler_Recording.cpp        |  1 -
 src/WSRequestHandler_ReplayBuffer.cpp     |  1 -
 src/WSRequestHandler_SceneCollections.cpp |  1 -
 src/WSRequestHandler_SceneItems.cpp       |  1 -
 src/WSRequestHandler_Scenes.cpp           |  1 -
 src/WSRequestHandler_Sources.cpp          |  1 -
 src/WSRequestHandler_Streaming.cpp        |  1 -
 src/WSRequestHandler_StudioMode.cpp       |  1 -
 src/WSRequestHandler_Transitions.cpp      |  1 -
 src/WSServer.cpp                          |  4 ++--
 src/WSServer.h                            |  8 ++++----
 src/forms/settings-dialog.h               |  2 +-
 src/obs-websocket.cpp                     |  7 ++++---
 22 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index c38bd1ad..a3746838 100644
--- a/src/Config.cpp
+++ b/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 <QTime>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QTime>
 
 #define SECTION_NAME "WebsocketAPI"
 #define PARAM_ENABLE "ServerEnabled"
diff --git a/src/Config.h b/src/Config.h
index eb3de519..4ff8d393 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -18,8 +18,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QString>
-#include <QSharedPointer>
+#include <QtCore/QString>
+#include <QtCore/QSharedPointer>
 
 class Config;
 typedef QSharedPointer<Config> ConfigPtr;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index d79bdaee..23c64236 100644
--- a/src/Utils.cpp
+++ b/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 <QDir>
-#include <QUrl>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QDir>
+#include <QtCore/QUrl>
+
 #include <obs-frontend-api.h>
 #include <obs.hpp>
 #include "obs-websocket.h"
diff --git a/src/Utils.h b/src/Utils.h
index 3c2d1b5b..e9f73e89 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -20,11 +20,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <stdio.h>
 
-#include <QSpinBox>
-#include <QPushButton>
-#include <QLayout>
-#include <QListWidget>
-#include <QSystemTrayIcon>
+#include <QtCore/QString>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QSystemTrayIcon>
 
 #include <obs.hpp>
 #include <obs-module.h>
diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp
index 6dc62c8c..c99c7d75 100644
--- a/src/WSEvents.cpp
+++ b/src/WSEvents.cpp
@@ -19,7 +19,7 @@
 
 #include <util/platform.h>
 
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 
 #include "Config.h"
 #include "Utils.h"
diff --git a/src/WSEvents.h b/src/WSEvents.h
index 1ea2bf89..7f6bdd4a 100644
--- a/src/WSEvents.h
+++ b/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 <QSharedPointer>
+#include <QtWidgets/QListWidgetItem>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 
 #include "WSServer.h"
diff --git a/src/WSRequestHandler.h b/src/WSRequestHandler.h
index 460785d5..8fbd59ae 100644
--- a/src/WSRequestHandler.h
+++ b/src/WSRequestHandler.h
@@ -19,9 +19,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QHash>
-#include <QSet>
-#include <QVariantHash>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
+#include <QtCore/QVariantHash>
+#include <QtCore/QString>
 
 #include <obs.hpp>
 #include <obs-frontend-api.h>
diff --git a/src/WSRequestHandler_General.cpp b/src/WSRequestHandler_General.cpp
index b28ac633..3c740022 100644
--- a/src/WSRequestHandler_General.cpp
+++ b/src/WSRequestHandler_General.cpp
@@ -1,5 +1,3 @@
-#include <QString>
-
 #include "Config.h"
 #include "Utils.h"
 #include "WSEvents.h"
diff --git a/src/WSRequestHandler_Profiles.cpp b/src/WSRequestHandler_Profiles.cpp
index 0d90ac5f..4bcc7d4d 100644
--- a/src/WSRequestHandler_Profiles.cpp
+++ b/src/WSRequestHandler_Profiles.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_Recording.cpp b/src/WSRequestHandler_Recording.cpp
index 8cdc9fd7..68bc0899 100644
--- a/src/WSRequestHandler_Recording.cpp
+++ b/src/WSRequestHandler_Recording.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_ReplayBuffer.cpp b/src/WSRequestHandler_ReplayBuffer.cpp
index cb699535..86add84a 100644
--- a/src/WSRequestHandler_ReplayBuffer.cpp
+++ b/src/WSRequestHandler_ReplayBuffer.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_SceneCollections.cpp b/src/WSRequestHandler_SceneCollections.cpp
index 2862e681..d4159321 100644
--- a/src/WSRequestHandler_SceneCollections.cpp
+++ b/src/WSRequestHandler_SceneCollections.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_SceneItems.cpp b/src/WSRequestHandler_SceneItems.cpp
index 76ecd971..f7106b41 100644
--- a/src/WSRequestHandler_SceneItems.cpp
+++ b/src/WSRequestHandler_SceneItems.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_Scenes.cpp b/src/WSRequestHandler_Scenes.cpp
index 497d17a0..6b63d71d 100644
--- a/src/WSRequestHandler_Scenes.cpp
+++ b/src/WSRequestHandler_Scenes.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp
index ca54992a..62299628 100644
--- a/src/WSRequestHandler_Sources.cpp
+++ b/src/WSRequestHandler_Sources.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_Streaming.cpp b/src/WSRequestHandler_Streaming.cpp
index f877e812..720aff34 100644
--- a/src/WSRequestHandler_Streaming.cpp
+++ b/src/WSRequestHandler_Streaming.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 #include "WSEvents.h"
 
diff --git a/src/WSRequestHandler_StudioMode.cpp b/src/WSRequestHandler_StudioMode.cpp
index 12d0a0bd..57f54e4b 100644
--- a/src/WSRequestHandler_StudioMode.cpp
+++ b/src/WSRequestHandler_StudioMode.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSRequestHandler_Transitions.cpp b/src/WSRequestHandler_Transitions.cpp
index 41b0f81a..b3ff9ac9 100644
--- a/src/WSRequestHandler_Transitions.cpp
+++ b/src/WSRequestHandler_Transitions.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include "Utils.h"
 
 #include "WSRequestHandler.h"
diff --git a/src/WSServer.cpp b/src/WSServer.cpp
index ba7f42f6..2a74ee01 100644
--- a/src/WSServer.cpp
+++ b/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 <QMessageBox>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMessageBox>
 #include <QtConcurrent/QtConcurrent>
 #include <obs-frontend-api.h>
 
diff --git a/src/WSServer.h b/src/WSServer.h
index d3e2e3eb..8147ca4f 100644
--- a/src/WSServer.h
+++ b/src/WSServer.h
@@ -18,10 +18,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QObject>
-#include <QMutex>
-#include <QSharedPointer>
-#include <QVariantHash>
+#include <QtCore/QObject>
+#include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariantHash>
 
 #include <map>
 #include <set>
diff --git a/src/forms/settings-dialog.h b/src/forms/settings-dialog.h
index 665d29de..138ae395 100644
--- a/src/forms/settings-dialog.h
+++ b/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"
 
diff --git a/src/obs-websocket.cpp b/src/obs-websocket.cpp
index 9939f8da..f3a52e69 100644
--- a/src/obs-websocket.cpp
+++ b/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 <QTimer>
+
+#include <QtCore/QTimer>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
 
 #include "obs-websocket.h"
 #include "WSServer.h"