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

@@ -10,6 +10,8 @@ TEMPLATE = lib
 CONFIG += plugins
 CONFIG += dll
 
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
 DEFINES += DIAGNOSEBASIC_LIBRARY
 DEFINES += NOMINMAX
 
@@ -22,11 +24,12 @@ HEADERS += diagnosebasic.h
 
 include(../plugin_template.pri)
 
-INCLUDEPATH +=  "$(BOOSTPATH)"
+INCLUDEPATH += "$${BOOSTPATH}"
 
 #CONFIG += dll
 
 #DEFINES += INIEDITOR_LIBRARY
 
 OTHER_FILES += \
-    diagnosebasic.json
+    diagnosebasic.json\
+    SConscript

src/diagnosebasic.h

@@ -25,9 +25,11 @@ along with this plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <iplugindiagnose.h>
 #include <imoinfo.h>
 #include <imodlist.h>
+#include <QString>
+#include <QSet>
 
 
-class DiagnoseBasic : public QObject, MOBase::IPlugin, MOBase::IPluginDiagnose
+class DiagnoseBasic : public QObject, public MOBase::IPlugin, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginDiagnose)
@@ -64,6 +66,7 @@ private:
   bool invalidFontConfig() const;
   bool nitpickInstalled() const;
   bool assetOrder() const;
+  bool missingMasters() const;
 
 private:
 
@@ -72,7 +75,8 @@ private:
   static const unsigned int PROBLEM_INVALIDFONT = 3;
   static const unsigned int PROBLEM_NITPICKINSTALLED = 4;
   static const unsigned int PROBLEM_ASSETORDER = 5;
-  static const unsigned int PROBLEM_MODLISTBACKUP = 6;
+  static const unsigned int PROBLEM_PROFILETWEAKS = 7;
+  static const unsigned int PROBLEM_MISSINGMASTERS = 8;
 
   static const unsigned int NUM_CONTEXT_ROWS = 5;
 
@@ -83,6 +87,9 @@ private:
     QString modName;
     int pluginPriority;
     int modPriority;
+    int sortGroup;
+    bool avoidMove;
+    QSet<QString> relevantScripts;
   };
 
   struct Move {
@@ -95,14 +102,36 @@ private:
     Move(const ListElement &initItem, const ListElement &initReference, EType initType)
       : item(initItem), reference(initReference), type(initType) {}
   };
+
+  struct Sorter {
+    struct {
+      int operator()(const ListElement &lhs, const ListElement &rhs)
+      {
+        return lhs.modPriority < rhs.modPriority;
+      }
+    } minMod;
+
+    std::vector<Move> moves;
+
+    void operator()(std::vector<ListElement> modList);
+  private:
+    void sortGroup(std::vector<ListElement> modList);
+  };
+
+
   friend bool operator<(const Move &lhs, const Move &rhs);
 
+private:
+
+  void topoSort(std::vector<ListElement> &list) const;
+
 private:
 
   MOBase::IOrganizer *m_MOInfo;
   mutable QString m_ErrorMessage;
   mutable std::vector <Move> m_SuggestedMoves;
   mutable QString m_NewestModlistBackup;
+  mutable std::set<QString> m_MissingMasters;
 
 };