From 4f8c71d62626aa61fb4d13f80bc043d5e6492c3e Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Fri, 12 Feb 2016 19:08:25 +0100
Subject: merged master into new_vfs_library

---
 src/organizercore.h | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/organizercore.h')

diff --git a/src/organizercore.h b/src/organizercore.h
index bf6c5a8b..ea37d72c 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -2,31 +2,44 @@
 #define ORGANIZERCORE_H
 
 
-#include "profile.h"
 #include "selfupdater.h"
-#include "iuserinterface.h"
+#include "iuserinterface.h" //should be class IUserInterface;
 #include "settings.h"
 #include "modlist.h"
+#include "modinfo.h"
 #include "pluginlist.h"
 #include "directoryrefresher.h"
 #include "installationmanager.h"
 #include "downloadmanager.h"
-#include "modlistsortproxy.h"
-#include "pluginlistsortproxy.h"
 #include "executableslist.h"
 #include "usvfsconnector.h"
 #include <directoryentry.h>
 #include <imoinfo.h>
 #include <iplugindiagnose.h>
-#include <iplugingame.h>
 #include <versioninfo.h>
-#include <guessedvalue.h>
 #include <delayedfilewriter.h>
 #include <boost/signals2.hpp>
+
+class ModListSortProxy;
+class PluginListSortProxy;
+class Profile;
+namespace MOBase { template <typename T> class GuessedValue; }
+namespace MOShared { class DirectoryEntry; }
+
+#include <QDir>
+#include <QList>
+#include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QStringList>
 #include <QThread>
 
+class QNetworkReply;
+class QUrl;
+class QWidget;
+
+#include <functional>
+#include <vector>
 
 class PluginContainer;
 
@@ -90,7 +103,7 @@ public:
     m_ExecutablesList = executablesList;
   }
 
-  Profile *currentProfile() { return m_CurrentProfile; }
+  Profile *currentProfile() const { return m_CurrentProfile; }
   void setCurrentProfile(const QString &profileName);
 
   std::vector<QString> enabledArchives();
@@ -158,6 +171,7 @@ public:
   bool onAboutToRun(const std::function<bool (const QString &)> &func);
   bool onFinishedRun(const std::function<void (const QString &, unsigned int)> &func);
   void refreshModList(bool saveChanges = true);
+  QStringList modsSortedByProfilePriority() const;
 
   /**
    * @brief return a descriptor of the mappings real file->virtual file
-- 
cgit v1.3.1