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.cpp | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index ecadfb5d..e50f1cd7 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1,15 +1,19 @@
 #include "organizercore.h"
 
+#include "imodinterface.h"
 #include "iplugingame.h"
-#include "mainwindow.h"
+#include "iuserinterface.h"
+#include "loadmechanism.h"
 #include "messagedialog.h"
+#include "modlistsortproxy.h"
+#include "plugincontainer.h"
+#include "pluginlistsortproxy.h"
 #include "logbuffer.h"
 #include "credentialsdialog.h"
 #include "filedialogmemory.h"
 #include "lockeddialog.h"
 #include "modinfodialog.h"
 #include "spawn.h"
-#include "safewritefile.h"
 #include "syncoverwritedialog.h"
 #include "nxmaccessmanager.h"
 #include <ipluginmodpage.h>
@@ -18,19 +22,29 @@
 #include <directoryentry.h>
 #include <scopeguard.h>
 #include <utility.h>
-#include <appconfig.h>
+#include "appconfig.h"
 #include <report.h>
 #include <questionboxmemory.h>
 
-#include <QNetworkInterface>
-#include <QMessageBox>
-#include <QDialogButtonBox>
 #include <QApplication>
+#include <QDialogButtonBox>
+#include <QMessageBox>
+#include <QNetworkInterface>
+#include <QProcess>
+#include <QTimer>
+#include <QWidget>
+
+#include <QtDebug>
 
 #include <Psapi.h>
 
+#include <exception>
 #include <functional>
 #include <boost/algorithm/string/predicate.hpp>
+#include <memory>
+#include <set>
+#include <utility>
+
 
 using namespace MOShared;
 using namespace MOBase;
@@ -953,6 +967,16 @@ ModList *OrganizerCore::modList()
   return &m_ModList;
 }
 
+QStringList OrganizerCore::modsSortedByProfilePriority() const
+{
+  QStringList res;
+  for (unsigned int i = 0; i < currentProfile()->numRegularMods(); ++i) {
+    int modIndex = currentProfile()->modIndexByPriority(i);
+    res.push_back(ModInfo::getByIndex(modIndex)->name());
+  }
+  return res;
+}
+
 void OrganizerCore::spawnBinary(const QFileInfo &binary,
                                 const QString &arguments,
                                 const QDir &currentDirectory,
-- 
cgit v1.3.1