From ab76e5212f058549dd995c47fb36176d9632c4bf Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sun, 17 Apr 2022 20:24:06 -0500
Subject: C++20 fixes

---
 src/directoryrefresher.cpp | 1 -
 src/directoryrefresher.h   | 1 +
 src/moapplication.cpp      | 1 -
 src/moapplication.h        | 2 +-
 src/moshortcut.cpp         | 1 -
 src/moshortcut.h           | 3 +--
 src/nxmaccessmanager.cpp   | 1 -
 src/nxmaccessmanager.h     | 2 +-
 8 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index 2128b4f4..90bfad3b 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -20,7 +20,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "directoryrefresher.h"
 #include "shared/fileentry.h"
 #include "shared/filesorigin.h"
-#include "shared/directoryentry.h"
 
 #include "iplugingame.h"
 #include "utility.h"
diff --git a/src/directoryrefresher.h b/src/directoryrefresher.h
index 7cdda99d..56394d94 100644
--- a/src/directoryrefresher.h
+++ b/src/directoryrefresher.h
@@ -20,6 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DIRECTORYREFRESHER_H
 #define DIRECTORYREFRESHER_H
 
+#include "shared/directoryentry.h"
 #include "shared/fileregisterfwd.h"
 #include "profile.h"
 #include <QObject>
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 85e02122..ef33663d 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -19,7 +19,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "moapplication.h"
 #include "settings.h"
-#include "env.h"
 #include "commandline.h"
 #include "instancemanager.h"
 #include "organizercore.h"
diff --git a/src/moapplication.h b/src/moapplication.h
index d10db320..7e8a8c6f 100644
--- a/src/moapplication.h
+++ b/src/moapplication.h
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QApplication>
 #include <QFileSystemWatcher>
+#include "env.h"
 
 class Settings;
 class MOMultiProcess;
@@ -31,7 +32,6 @@ class OrganizerCore;
 class NexusInterface;
 
 namespace MOBase { class IPluginGame; }
-namespace env { class ModuleNotification; }
 
 class MOApplication : public QApplication
 {
diff --git a/src/moshortcut.cpp b/src/moshortcut.cpp
index 4bbd61a4..0f5ae74e 100644
--- a/src/moshortcut.cpp
+++ b/src/moshortcut.cpp
@@ -1,5 +1,4 @@
 #include "moshortcut.h"
-#include "instancemanager.h"
 
 MOShortcut::MOShortcut(const QString& link)
   : m_valid(link.startsWith("moshortcut://"))
diff --git a/src/moshortcut.h b/src/moshortcut.h
index a693b6df..a6cf7fb5 100644
--- a/src/moshortcut.h
+++ b/src/moshortcut.h
@@ -2,8 +2,7 @@
 #define MODORGANIZER_MOSHORTCUT_INCLUDED
 
 #include <QString>
-
-class Instance;
+#include "instancemanager.h"
 
 class MOShortcut
 {
diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index f05aeb36..f98f2171 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -18,7 +18,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "nxmaccessmanager.h"
-#include "ui_validationprogressdialog.h"
 #include "iplugingame.h"
 #include "nexusinterface.h"
 #include "nxmurl.h"
diff --git a/src/nxmaccessmanager.h b/src/nxmaccessmanager.h
index 60100467..0812be40 100644
--- a/src/nxmaccessmanager.h
+++ b/src/nxmaccessmanager.h
@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define NXMACCESSMANAGER_H
 
 #include "apiuseraccount.h"
+#include "ui_validationprogressdialog.h"
 #include <QNetworkAccessManager>
 #include <QTimer>
 #include <QNetworkReply>
@@ -31,7 +32,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <set>
 
 namespace MOBase { class IPluginGame; }
-namespace Ui { class ValidationProgressDialog; }
 class NXMAccessManager;
 class Settings;
 
-- 
cgit v1.3.1