minor stuff

Changed pynedit.pro to fetch from 'standard' install location
Changed saveas code to use organizer report rather than uibase - this way it's
not dependant on the vagaries of the include path, and works the same as the
rest of the organiser directory

src/SConscript

@@ -0,0 +1,20 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.AppendUnique(CPPDEFINES = [
+    'DIAGNOSEBASIC_LIBRARY',
+    'NOMINMAX',
+    # suppress a few warnings caused by boost vs vc++ paranoia
+    '_SCL_SECURE_NO_WARNINGS'
+])
+
+env.AppendUnique(CPPPATH = [
+    '${BOOSTPATH}'
+])
+
+lib = env.SharedLibrary('diagnoseBasic', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')

src/diagnoseBasic.pro

@@ -31,4 +31,5 @@ INCLUDEPATH += "$${BOOSTPATH}"
 #DEFINES += INIEDITOR_LIBRARY
 
 OTHER_FILES += \
-    diagnosebasic.json
+    diagnosebasic.json\
+    SConscript

src/diagnosebasic.cpp

@@ -20,6 +20,9 @@
 #include "diagnosebasic.h"
 #include <report.h>
 #include <utility.h>
+#include <imodlist.h>
+#include <ipluginlist.h>
+#include <igameinfo.h>
 #include <QtPlugin>
 #include <QFile>
 #include <QDir>
@@ -45,7 +48,7 @@ using namespace MOBase;
 
 
 DiagnoseBasic::DiagnoseBasic()
-  : m_MOInfo(NULL)
+  : m_MOInfo(nullptr)
 {
 }
 
@@ -64,7 +67,10 @@ bool DiagnoseBasic::init(IOrganizer *moInfo)
   m_MOInfo->pluginList()->onPluginMoved([&] (const QString&, int, int) {
                                          invalidate();
                                       });
-  m_MOInfo->pluginList()->onRefreshed([&] () { this->invalidate(); });
+  m_MOInfo->pluginList()->onRefreshed([&] () { invalidate(); });
+  m_MOInfo->pluginList()->onPluginStateChanged([&] (const QString &, IPluginList::PluginStates) {
+    invalidate();
+  });
 
   return true;
 }
@@ -108,7 +114,7 @@ QList<PluginSetting> DiagnoseBasic::settings() const
 
 bool DiagnoseBasic::errorReported() const
 {
-  QDir dir(QCoreApplication::applicationDirPath() + "/logs");
+  QDir dir(qApp->property("dataPath").toString() + "/logs");
   QFileInfoList files = dir.entryInfoList(QStringList("ModOrganizer_??_??_??_??_??.log"),
                                           QDir::Files, QDir::Name | QDir::Reversed);
 
@@ -157,7 +163,7 @@ bool DiagnoseBasic::errorReported() const
 
 bool DiagnoseBasic::overwriteFiles() const
 {
-  QDir dir(QCoreApplication::applicationDirPath() + "/overwrite");
+  QDir dir(qApp->property("dataPath").toString() + "/overwrite");
 
   return dir.count() != 2; // account for . and ..
 }
@@ -335,12 +341,16 @@ bool DiagnoseBasic::assetOrder() const
 
   // list of mods containing conflicted scripts. We care only for those
   std::map<QString, QSet<QString>> scriptMods;
-  foreach (const IOrganizer::FileInfo & pex, m_MOInfo->findFileInfos("scripts",
-        [] (const IOrganizer::FileInfo &file) -> bool { return file.filePath.endsWith(".pex", Qt::CaseInsensitive); })) {
+  auto filter = [] (const IOrganizer::FileInfo &file) -> bool {
+    return file.filePath.endsWith(".pex", Qt::CaseInsensitive); };
+
+  for (const IOrganizer::FileInfo &pex : m_MOInfo->findFileInfos("scripts", filter)) {
     QStringList origins = pex.origins;
-    origins.removeAll("data"); // ignore files in base directory
+    // ignore files in base directories
+    origins.removeAll("data");
+    origins.removeAll("Overwrite");
     if (origins.size() > 1) {
-      foreach(const QString &origin, origins) {
+      for(const QString &origin : origins) {
         scriptMods[origin].insert(pex.filePath);
       }
     }
@@ -348,10 +358,12 @@ bool DiagnoseBasic::assetOrder() const
 
   // produce a list with the information we need: plugin, mod and the priority for each
   QStringList esps = m_MOInfo->findFiles("",
-      [] (const QString &fileName) -> bool { return fileName.endsWith(".esp", Qt::CaseInsensitive)
-                                                  || fileName.endsWith(".esm", Qt::CaseInsensitive); });
-  foreach (const QString &esp, esps) {
-    foreach (const QString origin, m_MOInfo->getFileOrigins(esp)) {
+                                         [] (const QString &fileName) -> bool {
+    return fileName.endsWith(".esp", Qt::CaseInsensitive)
+        || fileName.endsWith(".esm", Qt::CaseInsensitive);
+  });
+  for (const QString &esp : esps) {
+    for (const QString origin : m_MOInfo->getFileOrigins(esp)) {
       ListElement ele;
 
       ele.espName = QFileInfo(esp).fileName();
@@ -368,7 +380,6 @@ bool DiagnoseBasic::assetOrder() const
       }
     }
   }
-
   // generate a copy of list that contains each mod only once, otherwise
   // strange things happen if a mod contains multiple esps that are mixed
   // with esps from other mods
@@ -376,17 +387,18 @@ bool DiagnoseBasic::assetOrder() const
   {
     // sort the input list so we get predictable results
     std::sort(modList.begin(), modList.end(),
-              [] (const ListElement &lhs, const ListElement &rhs) -> bool { return lhs.pluginPriority < rhs.pluginPriority; });
+              [] (const ListElement &lhs, const ListElement &rhs) -> bool {
+      return lhs.pluginPriority < rhs.pluginPriority;
+    });
 
     std::set<QString> includedMods;
-    foreach(const ListElement &ele, modList) {
+    for (const ListElement &ele : modList) {
       if (includedMods.find(ele.modName) == includedMods.end()) {
         distinctModList.push_back(ele);
         includedMods.insert(ele.modName);
       }
     }
   }
-
   if (distinctModList.size() == 0) {
     return false;
   }
@@ -395,13 +407,16 @@ bool DiagnoseBasic::assetOrder() const
   std::sort(distinctModList.begin(), distinctModList.end(),
             [] (const ListElement &lhs, const ListElement &rhs) -> bool { return lhs.pluginPriority < rhs.pluginPriority; });
 
-  topoSort(distinctModList);
+  if (distinctModList.size() > 0) {
+    topoSort(distinctModList);
 
-  // now determine the moves necessary to bring the mod list into this order
-  minSorter(distinctModList);
-  m_SuggestedMoves = minSorter.moves;
-
-  return m_SuggestedMoves.size() > 0;
+    // now determine the moves necessary to bring the mod list into this order
+    minSorter(distinctModList);
+    m_SuggestedMoves = minSorter.moves;
+    return m_SuggestedMoves.size() > 0;
+  } else {
+    return false;
+  }
 }
 
 bool DiagnoseBasic::missingMasters() const
@@ -595,7 +610,7 @@ void DiagnoseBasic::startGuidedFix(unsigned int key) const
 {
   switch (key) {
     case PROBLEM_ASSETORDER: {
-      if (QMessageBox::warning(NULL, tr("Continue?"), tr("This <b>BETA</b> feature will rearrange your mods to eliminate all "
+      if (QMessageBox::warning(nullptr, tr("Continue?"), tr("This <b>BETA</b> feature will rearrange your mods to eliminate all "
               "possible ordering conflicts. Proceed?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
         foreach (const Move &op, m_SuggestedMoves) {
           int oldPriority = m_MOInfo->modList()->priority(op.item.modName);