From f2ee7c922b39748b819d800ccf58dde57c3c066c Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Thu, 4 Aug 2022 23:13:38 -0700
Subject: [PATCH] I think this makes qt6 work better

---
 src/Config.cpp                   | 14 +++++++-------
 src/Config.h                     |  4 ++--
 src/Utils.cpp                    |  6 +++---
 src/Utils.h                      | 12 ++++++------
 src/WSEvents.cpp                 |  2 +-
 src/WSEvents.h                   |  6 +++---
 src/WSRequestHandler.h           |  6 +++---
 src/WSRequestHandler_General.cpp |  4 ++--
 src/WSRequestHandler_Sources.cpp | 10 +++++-----
 src/WSServer.cpp                 | 14 ++++++++++----
 src/WSServer.h                   | 10 +++++-----
 src/forms/settings-dialog.cpp    |  2 +-
 src/forms/settings-dialog.h      |  2 +-
 src/obs-websocket.cpp            |  6 +++---
 src/rpc/RpcRequest.h             |  2 +-
 src/rpc/RpcResponse.h            |  2 +-
 16 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index c522a08c..15767fb9 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -18,13 +18,13 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-frontend-api.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QTime>
-#include <QtWidgets/QSystemTrayIcon>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QMessageBox>
+#include <QObject>
+#include <QCryptographicHash>
+#include <QTime>
+#include <QSystemTrayIcon>
+#include <QMainWindow>
+#include <QInputDialog>
+#include <QMessageBox>
 
 #define SECTION_NAME "WebsocketAPI"
 #define PARAM_ENABLE "ServerEnabled"
diff --git a/src/Config.h b/src/Config.h
index 1aa29ebf..fb45fcf1 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -20,8 +20,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-frontend-api.h>
 #include <util/config-file.h>
-#include <QtCore/QString>
-#include <QtCore/QSharedPointer>
+#include <QString>
+#include <QSharedPointer>
 
 class Config {
 	public:
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 38b5478d..13073c3d 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -17,9 +17,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include <inttypes.h>
-#include <QtWidgets/QMainWindow>
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
+#include <QMainWindow>
+#include <QDir>
+#include <QUrl>
 
 #include <obs-frontend-api.h>
 #include <obs.hpp>
diff --git a/src/Utils.h b/src/Utils.h
index ba227f15..85c5c868 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -20,12 +20,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <stdio.h>
 
-#include <QtCore/QString>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QLayout>
-#include <QtWidgets/QListWidget>
-#include <QtWidgets/QSystemTrayIcon>
+#include <QString>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QLayout>
+#include <QListWidget>
+#include <QSystemTrayIcon>
 
 #include <obs.hpp>
 #include <obs-module.h>
diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp
index f96019de..d4b18e70 100644
--- a/src/WSEvents.cpp
+++ b/src/WSEvents.cpp
@@ -21,7 +21,7 @@
 #include <util/platform.h>
 #include <media-io/video-io.h>
 
-#include <QtWidgets/QPushButton>
+#include <QPushButton>
 
 #include "WSEvents.h"
 
diff --git a/src/WSEvents.h b/src/WSEvents.h
index ed480e88..f0c4cf67 100644
--- a/src/WSEvents.h
+++ b/src/WSEvents.h
@@ -23,9 +23,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 #include <util/platform.h>
 
-#include <QtWidgets/QListWidgetItem>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
+#include <QListWidgetItem>
+#include <QSharedPointer>
+#include <QTimer>
 
 #include "WSServer.h"
 
diff --git a/src/WSRequestHandler.h b/src/WSRequestHandler.h
index 157db426..9dbec031 100644
--- a/src/WSRequestHandler.h
+++ b/src/WSRequestHandler.h
@@ -19,9 +19,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <QtCore/QString>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
+#include <QString>
+#include <QHash>
+#include <QSet>
 
 #include <obs.hpp>
 #include <obs-frontend-api.h>
diff --git a/src/WSRequestHandler_General.cpp b/src/WSRequestHandler_General.cpp
index 2dec543f..cdcdd0b5 100644
--- a/src/WSRequestHandler_General.cpp
+++ b/src/WSRequestHandler_General.cpp
@@ -1,7 +1,7 @@
 #include "WSRequestHandler.h"
 
-#include <QtCore/QByteArray>
-#include <QtGui/QImageWriter>
+#include <QByteArray>
+#include <QImageWriter>
 
 #include "obs-websocket.h"
 #include "Config.h"
diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp
index 2336061a..8eb03121 100644
--- a/src/WSRequestHandler_Sources.cpp
+++ b/src/WSRequestHandler_Sources.cpp
@@ -1,8 +1,8 @@
-#include <QtCore/QString>
-#include <QtCore/QBuffer>
-#include <QtCore/QFileInfo>
-#include <QtGui/QImage>
-#include <QtGui/QImageWriter>
+#include <QString>
+#include <QBuffer>
+#include <QFileInfo>
+#include <QImage>
+#include <QImageWriter>
 
 #include "Utils.h"
 
diff --git a/src/WSServer.cpp b/src/WSServer.cpp
index 9ee6de3a..66559fc8 100644
--- a/src/WSServer.cpp
+++ b/src/WSServer.cpp
@@ -19,11 +19,13 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <chrono>
 #include <thread>
 
-#include <QtCore/QThread>
-#include <QtCore/QByteArray>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QMessageBox>
+#include <QThread>
+#include <QByteArray>
+#include <QMainWindow>
+#include <QMessageBox>
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 #include <QtConcurrent/QtConcurrent>
+#endif
 #include <obs-frontend-api.h>
 #include <util/platform.h>
 
@@ -222,7 +224,11 @@ void WSServer::onMessage(connection_hdl hdl, server::message_ptr message)
 		return;
 	}
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	QtConcurrent::run(&_threadPool, [=]() {
+#else
+	_threadPool::run([=]() {
+#endif
 		std::string payload = message->get_payload();
 
 		QMutexLocker locker(&_clMutex);
diff --git a/src/WSServer.h b/src/WSServer.h
index 6977a8c5..d8a4877d 100644
--- a/src/WSServer.h
+++ b/src/WSServer.h
@@ -20,11 +20,11 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <map>
 #include <set>
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariantHash>
-#include <QtCore/QThreadPool>
+#include <QObject>
+#include <QMutex>
+#include <QSharedPointer>
+#include <QVariantHash>
+#include <QThreadPool>
 
 #include <asio.hpp>
 #include <websocketpp/config/asio_no_tls.hpp>
diff --git a/src/forms/settings-dialog.cpp b/src/forms/settings-dialog.cpp
index ec33cc79..b826141c 100644
--- a/src/forms/settings-dialog.cpp
+++ b/src/forms/settings-dialog.cpp
@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-frontend-api.h>
 #include <obs-module.h>
-#include <QtWidgets/QMessageBox>
+#include <QMessageBox>
 
 #include "../obs-websocket.h"
 #include "../Config.h"
diff --git a/src/forms/settings-dialog.h b/src/forms/settings-dialog.h
index f67f1f98..462270c2 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 <QtWidgets/QDialog>
+#include <QDialog>
 
 #include "ui_settings-dialog.h"
 
diff --git a/src/obs-websocket.cpp b/src/obs-websocket.cpp
index b4813635..0303b09c 100644
--- a/src/obs-websocket.cpp
+++ b/src/obs-websocket.cpp
@@ -20,9 +20,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 #include <obs-data.h>
 
-#include <QtCore/QTimer>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QMainWindow>
+#include <QTimer>
+#include <QAction>
+#include <QMainWindow>
 
 #include "obs-websocket.h"
 #include "WSServer.h"
diff --git a/src/rpc/RpcRequest.h b/src/rpc/RpcRequest.h
index 3e360150..d81e52d1 100644
--- a/src/rpc/RpcRequest.h
+++ b/src/rpc/RpcRequest.h
@@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #pragma once
 
 #include <obs-data.h>
-#include <QtCore/QString>
+#include <QString>
 #include "../obs-websocket.h"
 
 // forward declarations
diff --git a/src/rpc/RpcResponse.h b/src/rpc/RpcResponse.h
index d0c96d6e..c5e2adad 100644
--- a/src/rpc/RpcResponse.h
+++ b/src/rpc/RpcResponse.h
@@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #pragma once
 
 #include <obs-data.h>
-#include <QtCore/QString>
+#include <QString>
 #include "../obs-websocket.h"
 
 class RpcRequest;