refactor: do not include full modules in qt files

src/gui/src/DeskflowApplication.cpp

@@ -20,9 +20,6 @@
 
 #include "MainWindow.h"
 
-#include <QtCore>
-#include <QtGui>
-
 DeskflowApplication::DeskflowApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
 

src/gui/src/HotkeyDialog.cpp

@@ -19,9 +19,6 @@
 #include "HotkeyDialog.h"
 #include "ui_HotkeyDialog.h"
 
-#include <QtCore>
-#include <QtGui>
-
 HotkeyDialog::HotkeyDialog(QWidget *parent, Hotkey &hotkey)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
       ui{std::make_unique<Ui::HotkeyDialog>()},

src/gui/src/KeySequence.cpp

@@ -17,9 +17,7 @@
  */
 
 #include "KeySequence.h"
-
+#include <QSettings>
-#include <QtCore>
-#include <QtGui>
 
 // this table originally comes from Qt sources (gui/kernel/qkeysequence.cpp)
 // and is heavily modified for Deskflow

src/gui/src/MainWindow.cpp

@@ -48,12 +48,11 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
+#include <QNetworkInterface>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QScrollBar>
-#include <QtCore>
+
-#include <QtGui>
-#include <QtNetwork>
 #include <memory>
 
 #if defined(Q_OS_MAC)

src/gui/src/ScreenSettingsDialog.cpp

@@ -26,8 +26,6 @@
 #include "gui/validators/ValidationError.h"
 
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using namespace deskflow::gui;
 using enum ScreenConfig::Modifier;

src/gui/src/ScreenSetupModel.cpp

@@ -18,10 +18,11 @@
 
 #include "ScreenSetupModel.h"
 
-#include "gui/config/Screen.h"
+#include <QIODevice>
+#include <QIcon>
+#include <QMimeData>
 
-#include <QtCore>
+#include "gui/config/Screen.h"
-#include <QtGui>
 
 const QString ScreenSetupModel::m_MimeType = "application/x-" DESKFLOW_APP_ID "-screen";
 

src/gui/src/ScreenSetupView.cpp

@@ -21,9 +21,13 @@
 #include "ScreenSettingsDialog.h"
 #include "ScreenSetupModel.h"
 
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
 #include <QHeaderView>
-#include <QtCore>
+#include <QMimeData>
-#include <QtGui>
+#include <QMouseEvent>
+#include <QResizeEvent>
 
 ScreenSetupView::ScreenSetupView(QWidget *parent) : QTableView(parent)
 {
@@ -151,4 +155,4 @@ void ScreenSetupView::initViewItemOption(QStyleOptionViewItem *option) const
   option->decorationPosition = QStyleOptionViewItem::Top;
   option->displayAlignment = Qt::AlignCenter;
   option->textElideMode = Qt::ElideMiddle;
-}
+}

src/gui/src/ServerConfig.cpp

@@ -25,7 +25,6 @@
 #include <QAbstractButton>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QtCore>
 
 using namespace deskflow::gui::proxy;
 using enum ScreenConfig::Modifier;

src/gui/src/ServerConfigDialog.cpp

@@ -26,8 +26,6 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using enum ScreenConfig::SwitchCorner;
 using ServerProtocol = synergy::gui::ServerProtocol;

src/gui/src/TrashScreenWidget.cpp

@@ -17,10 +17,12 @@
  */
 
 #include "TrashScreenWidget.h"
-#include "ScreenSetupModel.h"
 
-#include <QtCore>
+#include <QDragEnterEvent>
-#include <QtGui>
+#include <QDropEvent>
+#include <QMimeData>
+
+#include "ScreenSetupModel.h"
 
 void TrashScreenWidget::dragEnterEvent(QDragEnterEvent *event)
 {

src/gui/src/main.cpp

@@ -40,9 +40,7 @@
 #include <QGuiApplication>
 #include <QMessageBox>
 #include <QObject>
-#include <QtCore>
 #include <QtGlobal>
-#include <QtGui>
 
 #if defined(Q_OS_MAC)
 #include <Carbon/Carbon.h>

src/lib/arch/unix/ArchSystemUnix.cpp

@@ -20,8 +20,12 @@
 #include <array>
 
 #include <sys/utsname.h>
+
 #ifndef __APPLE__
-#include <QtDBus>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QDBusInterface>
+#include <QDBusReply>
 #endif
 
 //

src/lib/gui/config/AppConfig.cpp

@@ -24,8 +24,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QVariant>
-#include <QtCore>
-#include <QtNetwork>
 #include <functional>
 
 using namespace deskflow::gui;

src/lib/gui/config/Screen.cpp

@@ -19,9 +19,6 @@
 #include "Screen.h"
 #include "config/ScreenConfig.h"
 
-#include <QtCore>
-#include <QtGui>
-
 using namespace deskflow::gui::proxy;
 using enum ScreenConfig::Modifier;
 using enum ScreenConfig::SwitchCorner;

src/lib/gui/dialogs/AboutDialog.cpp

@@ -24,7 +24,6 @@
 
 #include <QDateTime>
 #include <QGuiApplication>
-#include <QtCore>
 
 using namespace deskflow::gui;
 

src/lib/gui/dialogs/SettingsDialog.cpp

@@ -33,8 +33,6 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using namespace deskflow::gui;
 

src/lib/gui/env_vars.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <QString>
-#include <QtCore>
 
 namespace deskflow::gui::env_vars {
 

src/lib/platform/XWindowsKeyState.cpp

@@ -16,8 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QString>
 #ifndef __APPLE__
-#include <QtDBus>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusPendingReply>
 #endif
 
 #include "platform/XWindowsKeyState.h"