From 8cb1015a3589f06339d7af93114c56bb6dd9b08d Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 9 Jul 2019 00:04:52 +0200
Subject: [PATCH] Remove use of QDesktopWidget in settingsdialog

---
 src/settings/settingsdialog.cpp | 22 ++++++++--------------
 src/settings/settingsdialog.h   | 15 ++++++---------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 32b2eceff..4c89d6dee 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -20,28 +20,22 @@
 
 #include "config.h"
 
-#include <QObject>
-#include <QWidget>
-#include <QApplication>
+#include <QDialog>
+#include <QWindow>
+#include <QScreen>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
-#include <QDesktopWidget>
-#include <QVariant>
+#include <QTreeWidget>
 #include <QString>
-#include <QStringBuilder>
-#include <QIcon>
 #include <QPainter>
-#include <QFlags>
 #include <QFrame>
 #include <QKeySequence>
-#include <QLabel>
-#include <QLayout>
 #include <QRect>
+#include <QSize>
 #include <QDialogButtonBox>
-#include <QPushButton>
 #include <QScrollArea>
-#include <QStackedWidget>
-#include <QTreeWidget>
+#include <QComboBox>
+#include <QPushButton>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -287,7 +281,7 @@ void SettingsDialog::showEvent(QShowEvent *e) {
   loading_settings_ = false;
 
   // Resize the dialog if it's too big
-  const QSize available = QApplication::desktop()->availableGeometry(this).size();
+  const QRect available = window()->windowHandle()->screen()->geometry();
   if (available.height() < height()) {
     resize(width(), sizeHint().height());
   }
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 1f25faf2b..a74ec0005 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -24,25 +24,22 @@
 #include "config.h"
 
 #include <stdbool.h>
-#include <QObject>
-#include <QWidget>
 #include <QDialog>
+#include <QStyledItemDelegate>
 #include <QMap>
 #include <QSize>
 #include <QString>
 #include <QPainter>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QAbstractButton>
-#include <QScrollArea>
-#include <QTreeWidgetItem>
-#include <QComboBox>
 #include <QSettings>
 
 #include "core/logging.h"
 #include "widgets/osd.h"
 
-class QModelIndex;
+class QTreeWidgetItem;
+class QComboBox;
+class QScrollArea;
+class QAbstractButton;
+class QStyleOptionViewItem;
 class QShowEvent;
 
 class Application;