More refactoring

5 files changed, 9 insertions, 7 deletions

diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp
index c34d211f..70190433 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -35,7 +35,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QInputDialog>

 #include <QWebEngineHistory>

 #include <QDir>

-#include <QDesktopWidget>

 #include <QKeyEvent>

 

 

diff --git a/src/main.cpp b/src/main.cpp
index b83e581b..1e60483f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -645,10 +645,13 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     if (settings.contains("window_monitor")) {
       const int monitor = settings.value("window_monitor").toInt();
 
-      if (monitor != -1) {
+      if (monitor != -1 && QGuiApplication::screens().size() > monitor) {
         QGuiApplication::screens().at(monitor)->geometry().center();
         const QPoint center = QGuiApplication::screens().at(monitor)->geometry().center();
         splash.move(center - splash.rect().center());
+      } else {
+        const QPoint center = QGuiApplication::primaryScreen()->geometry().center();
+        splash.move(center - splash.rect().center());
       }
     }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7681b482..9726b27b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -99,7 +99,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QCoreApplication>
 #include <QCursor>
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QDesktopServices>
 #include <QDialog>
 #include <QDirIterator>
@@ -1340,7 +1339,7 @@ void MainWindow::displaySaveGameInfo(QListWidgetItem *newItem)
   }
   m_CurrentSaveView->setSave(save);
 
-  QRect screenRect = QApplication::desktop()->availableGeometry(m_CurrentSaveView);
+  QRect screenRect = m_CurrentSaveView->window()->windowHandle()->screen()->geometry();
 
   QPoint pos = QCursor::pos();
   if (pos.x() + m_CurrentSaveView->width() > screenRect.right()) {
@@ -2279,7 +2278,9 @@ void MainWindow::storeSettings(QSettings &settings) {
     settings.setValue("menubar_visible", m_menuBarVisible);
     settings.setValue("statusbar_visible", m_statusBarVisible);
     settings.setValue("window_split", ui->splitter->saveState());
-    settings.setValue("window_monitor", QApplication::desktop()->screenNumber(this));
+    QScreen *screen = this->window()->windowHandle()->screen();
+    int screenId = QGuiApplication::screens().indexOf(screen);
+    settings.setValue("window_monitor", screenId);
     settings.setValue("log_split", ui->topLevelSplitter->saveState());
     settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry());
     settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked());
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 6dd1fe4e..698c8534 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -1224,5 +1224,5 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
 
   return ConflictItem(
     std::move(beforeQS), std::move(relativeName), std::move(afterQS),
-    index, std::move(fileName), hasAlts, QString::null, archive);
+    index, std::move(fileName), hasAlts, QString(), archive);
 }
diff --git a/src/pch.h b/src/pch.h
index 1d8df43a..9640b09d 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -91,7 +91,6 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QDesktopServices>
-#include <QDesktopWidget>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QDir>