Merge branch 'ThosRTanner-master'

16 files changed, 25 insertions, 27 deletions

diff --git a/src/SConscript b/src/SConscript
index 787561b8..6de7cb62 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -67,7 +67,6 @@ env.Uic(env.Glob('*.ui'))
 

 env.RequireLibraries('uibase', 'shared', 'bsatk', 'esptk')

 

-

 env.AppendUnique(LIBS = [

     'shell32',

     'user32',

@@ -124,8 +123,9 @@ env.AppendUnique(LINKFLAGS = [
 

 #  modeltest is optional and it doesn't compile anyway...

 cpp_files = [

-    x for x in Glob('*.cpp')

-        if x.name != 'modeltest.cpp' and x.name != 'aboutdialog.cpp'

+    x for x in env.Glob('*.cpp', source = True)

+        if x.name != 'modeltest.cpp' and x.name != 'aboutdialog.cpp' and \

+           not x.name.startswith('moc_') # I think this is a strange bug

 ]

 

 about_env = env.Clone()

diff --git a/src/bbcode.cpp b/src/bbcode.cpp
index 0f9170d4..56369538 100644
--- a/src/bbcode.cpp
+++ b/src/bbcode.cpp
@@ -21,8 +21,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include <QRegExp>

 #include <map>

-#include <algorithm>

-#include <boost/assign.hpp>

 

 

 namespace BBCode {

@@ -80,7 +78,7 @@ public:
             if (tagName == "color") {

               QString color = tagIter->second.first.cap(1);

               QString content = tagIter->second.first.cap(2);

-              if (color.at(0) == "#") {

+              if (color.at(0) == '#') {

                 return temp.replace(tagIter->second.first, QString("<font style=\"color: %1;\">%2</font>").arg(color, content));

               } else {

                 auto colIter = m_ColorMap.find(color.toLower());

diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp
index bbdf95c5..e5f0f21d 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -24,7 +24,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "messagedialog.h"

 #include "report.h"

 #include "persistentcookiejar.h"

-#include "json.h"

+

 #include <utility.h>

 #include "settings.h"

 

diff --git a/src/browserview.h b/src/browserview.h
index f8b132b8..6a89752a 100644
--- a/src/browserview.h
+++ b/src/browserview.h
@@ -21,9 +21,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define NEXUSVIEW_H

 

 

+class QEvent;

+class QUrl;

+class QWidget;

 #include <QWebView>

 #include <QWebPage>

-#include <QTabWidget>

 

 /**

  * @brief web view used to display a nexus page

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 70caaf3e..cbc1ba45 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -26,7 +26,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <nxmurl.h>

 #include <taskprogressmanager.h>

 #include "utility.h"

-#include "json.h"

 #include "selectiondialog.h"

 #include "bbcode.h"

 #include <utility.h>

diff --git a/src/helper.h b/src/helper.h
index 36f10db1..410e2527 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -21,7 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define HELPER_H

 

 

-#include <QString>

+#include <string>

 

 

 /**

diff --git a/src/loadmechanism.cpp b/src/loadmechanism.cpp
index 99fce3ba..47587467 100644
--- a/src/loadmechanism.cpp
+++ b/src/loadmechanism.cpp
@@ -56,7 +56,7 @@ void LoadMechanism::writeHintFile(const QDir &targetDirectory)
 }

 

 

-void LoadMechanism::removeHintFile(QDir &targetDirectory)

+void LoadMechanism::removeHintFile(QDir targetDirectory)

 {

   targetDirectory.remove("mo_path.txt");

 }

diff --git a/src/loadmechanism.h b/src/loadmechanism.h
index 43a8dd6c..c04473ab 100644
--- a/src/loadmechanism.h
+++ b/src/loadmechanism.h
@@ -91,7 +91,7 @@ private:
   void writeHintFile(const QDir &targetDirectory);

 

   // remove the hint file if it exists. does nothing if the file doesn't exist

-  void removeHintFile(QDir &targetDirectory);

+  void removeHintFile(QDir targetDirectory);

 

   // compare the two files by md5-hash, returns true if they are identical

   bool hashIdentical(const QString &fileNameLHS, const QString &fileNameRHS);

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index a4a8110c..8bc767c5 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -28,7 +28,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "categories.h"
 #include "modinfodialog.h"
 #include "overwriteinfodialog.h"
-#include "json.h"
 #include "filenamestring.h"
 #include "versioninfo.h"
 
diff --git a/src/modinfoforeign.h b/src/modinfoforeign.h
index b8ff2671..b35c099b 100644
--- a/src/modinfoforeign.h
+++ b/src/modinfoforeign.h
@@ -35,7 +35,7 @@ public:
   virtual QString notes() const { return ""; }
   virtual QDateTime creationTime() const;
   virtual QString absolutePath() const;
-  virtual MOBase::VersionInfo getNewestVersion() const { return ""; }
+  virtual MOBase::VersionInfo getNewestVersion() const { return QString(); }
   virtual QString getInstallationFile() const { return ""; }
   virtual int getNexusID() const { return -1; }
   virtual std::vector<QString> getIniTweaks() const { return std::vector<QString>(); }
diff --git a/src/modinfooverwrite.h b/src/modinfooverwrite.h
index 9184a90c..b6cdfb43 100644
--- a/src/modinfooverwrite.h
+++ b/src/modinfooverwrite.h
@@ -37,7 +37,7 @@ public:
   virtual QString notes() const { return ""; }
   virtual QDateTime creationTime() const { return QDateTime(); }
   virtual QString absolutePath() const;
-  virtual MOBase::VersionInfo getNewestVersion() const { return ""; }
+  virtual MOBase::VersionInfo getNewestVersion() const { return QString(); }
   virtual QString getInstallationFile() const { return ""; }
   virtual int getFixedPriority() const { return INT_MAX; }
   virtual int getNexusID() const { return -1; }
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 9bed19b3..26a74ef6 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -214,8 +214,8 @@ void NexusInterface::interpretNexusFileName(const QString &fileName, QString &mo
         QString r3Highlight(fileName);

         r3Highlight.insert(result.position(3) + result.length(3), "* ").insert(result.position(3), " *");

 

-        selection.addChoice(candidate.c_str(), r3Highlight, strtol(candidate.c_str(), nullptr, 10));

-        selection.addChoice(candidate2.c_str() + offset, r2Highlight, abs(strtol(candidate2.c_str() + offset, nullptr, 10)));

+        selection.addChoice(candidate.c_str(), r3Highlight, static_cast<int>(strtol(candidate.c_str(), nullptr, 10)));

+        selection.addChoice(candidate2.c_str() + offset, r2Highlight, static_cast<int>(abs(strtol(candidate2.c_str() + offset, nullptr, 10))));

         if (selection.exec() == QDialog::Accepted) {

           modID = selection.getChoiceData().toInt();

         } else {

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index c37131eb..7d0dacc2 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -26,8 +26,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "selfupdater.h"

 #include "persistentcookiejar.h"

 #include "settings.h"

-#include <json.h>

-

+#include <gameinfo.h>

 #include <QMessageBox>

 #include <QPushButton>

 #include <QNetworkProxy>

diff --git a/src/settings.cpp b/src/settings.cpp
index e175b210..479dd3ab 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -22,7 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialog.h"
 #include "utility.h"
 #include "helper.h"
-#include "json.h"
+#include <gameinfo.h>
 #include <appconfig.h>
 #include <utility.h>
 #include <iplugingame.h>
diff --git a/src/settings.h b/src/settings.h
index b6f25a6d..1ee16e76 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -328,7 +328,7 @@ private:
   };
 
   /** Display/store the configuration in the 'general' tab of the settings dialogue */
-  class GeneralTab : SettingsTab
+  class GeneralTab : public SettingsTab
   {
   public:
     GeneralTab(Settings *m_parent, SettingsDialog &m_dialog);
@@ -347,7 +347,7 @@ private:
   };
 
   /** Display/store the configuration in the 'nexus' tab of the settings dialogue */
-  class NexusTab : SettingsTab
+  class NexusTab : public SettingsTab
   {
   public:
     NexusTab(Settings *m_parent, SettingsDialog &m_dialog);
@@ -365,7 +365,7 @@ private:
   };
 
   /** Display/store the configuration in the 'steam' tab of the settings dialogue */
-  class SteamTab : SettingsTab
+  class SteamTab : public SettingsTab
   {
   public:
     SteamTab(Settings *m_parent, SettingsDialog &m_dialog);
@@ -378,7 +378,7 @@ private:
   };
 
   /** Display/store the configuration in the 'plugins' tab of the settings dialogue */
-  class PluginsTab : SettingsTab
+  class PluginsTab : public SettingsTab
   {
   public:
     PluginsTab(Settings *m_parent, SettingsDialog &m_dialog);
@@ -391,7 +391,7 @@ private:
   };
 
   /** Display/store the configuration in the 'workarounds' tab of the settings dialogue */
-  class WorkaroundsTab : SettingsTab
+  class WorkaroundsTab : public SettingsTab
   {
   public:
     WorkaroundsTab(Settings *m_parent, SettingsDialog &m_dialog);
diff --git a/src/shared/stackdata.cpp b/src/shared/stackdata.cpp
index 6c5a0968..b336593a 100644
--- a/src/shared/stackdata.cpp
+++ b/src/shared/stackdata.cpp
@@ -24,7 +24,7 @@ static void initDbgIfNecess()
       firstCall = false;

     }

     if (!::SymInitialize(process, NULL, TRUE)) {

-      printf("failed to initialize symbols: %d", ::GetLastError());

+      printf("failed to initialize symbols: %lu", ::GetLastError());

     }

     initialized.insert(::GetCurrentProcessId());

   }

@@ -99,7 +99,8 @@ void StackData::initTrace() {
   CONTEXT context;

   std::memset(&context, 0, sizeof(CONTEXT));

   context.ContextFlags = CONTEXT_CONTROL;

-#if BOOST_ARCH_X86_64

+  //Why only for 64 bit?

+#if BOOST_ARCH_X86_64 || defined(__clang__)

   ::RtlCaptureContext(&context);

 #else

   __asm