From 0f8ae514592c46dc8465bc5830d7a830b68affe2 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Sat, 17 Oct 2015 19:05:00 +0100
Subject: Added support for include-what-you-use in a very simplistic fashion
 to the Scons build. This isn't exactly production ready because the qt
 headers are a nightmarish web of interdependencies but it's useful for
 checking.

I've also removed a few unused include files it detected and corrected some things that upset clang in a big way.
---
 qtmappings.imp              | 195 ++++++++++++++++++++++++++++++++++++++++++++
 scons_configure_template.py |   3 +
 src/SConscript              |  14 +++-
 src/bbcode.cpp              |   4 +-
 src/browserdialog.cpp       |   2 -
 src/browserview.h           |   4 +-
 src/downloadmanager.cpp     |   1 -
 src/helper.h                |   2 +-
 src/loadmechanism.cpp       |   2 +-
 src/loadmechanism.h         |   2 +-
 src/modinfo.cpp             |   1 -
 src/modinfo.h               |   4 +-
 src/nxmaccessmanager.cpp    |   1 -
 src/settings.cpp            |   1 -
 src/settings.h              |  10 +--
 15 files changed, 223 insertions(+), 23 deletions(-)
 create mode 100644 qtmappings.imp

diff --git a/qtmappings.imp b/qtmappings.imp
new file mode 100644
index 00000000..3dc2e5f5
--- /dev/null
+++ b/qtmappings.imp
@@ -0,0 +1,195 @@
+[
+# Overrides. Some classes are defined by the spec to reside in their own headers but actually use the same
+# header as another class. It might make some sense using this for every class in QT...
+    { symbol: [ "QAbstractTableModel",                      "private", "<QAbstractTableModel>", "public" ] },
+    { symbol: [ "QAtomicInt",                               "private", "<QAtomicInt>", "public"] },
+    { symbol: [ "QDate",                                    "private", "<QDate>", "public"] },
+    { symbol: [ "QKeyEvent",                                "private", "<QKeyEvent>", "public" ] },
+    { symbol: [ "QDragEnterEvent",                          "private", "<QDragEnterEvent>", "public" ] },
+    { symbol: [ "QListWidgetItem",                          "private", "<QListWidgetItem>", "public" ] },
+    { symbol: [ "QModelIndex",                              "private", "<QModelIndex>", "public" ] },
+    { symbol: [ "QMouseEvent",                              "private", "<QMouseEvent>", "public" ] },
+    { symbol: [ "QMutableHashIterator",                     "private", "<QMutableHashIterator>", "public" ] },
+    { symbol: [ "QScopedArrayPointer",                      "private", "<QScopedArrayPointer>", "public" ] },
+    { symbol: [ "QStyleOptionSlider",                       "private", "<QStyleOptionSlider>", "public" ] },
+    { symbol: [ "QStyleOptionViewItem",                     "private", "<QStyleOptionViewItem>", "public" ] },
+    { symbol: [ "QTime",                                    "private", "<QTime>", "public"] },
+    { symbol: [ "QTableWidgetItem",                         "private", "<QTableWidgetItem>", "public" ] },
+    { symbol: [ "QTreeWidgetItem",                          "private", "<QTreeWidgetItem>", "public" ] },
+    { symbol: [ "QVBoxLayout",                              "private", "<QVBoxLayout>", "public" ] },
+    { symbol: [ "QWebHitTestResult",                        "private", "<QWebHitTestResult>", "public" ] },
+    { symbol: [ "qobject_cast",                             "private", "<QObject>", "public"] },
+
+
+# these are in QMetaType but the documentation is slightly unclear as to where they are meant to be defined.
+    { symbol: [ "QVariantMap",                              "private", "<QVariant>", "public" ] },
+    { symbol: [ "QVariantList",                             "private", "<QVariant>", "public" ] },
+
+#Normal header overrides
+
+    { include: [ "@\"(QtCore/)?qabstractitemmodel\\.h\"",   "private", "<QAbstractItemModel>", "public" ] },
+    { include: [ "@\"(QtCore/)?qalgorithms\\.h\"",          "private", "<QtAlgorithms>", "public" ] },
+    { include: [ "@\"(QtCore/)?qbytearray\\.h\"",           "private", "<QByteArray>", "public" ] },
+    { include: [ "@\"(QtCore/)?qchar\\.h\"",                "private", "<QChar>", "public" ] },
+    { include: [ "@\"(QtCore/)?qcoreapplication\\.h\"",     "private", "<QCoreApplication>", "public" ] },
+    { include: [ "@\"(QtCore/)?qcoreevent\\.h\"",           "private", "<QEvent>", "public" ] },
+    { include: [ "@\"(QtCore/)?qdatastream\\.h\"",          "private", "<QDataStream>", "public" ] },
+    { include: [ "@\"(QtCore/)?qdatetime\\.h\"",            "private", "<QDateTime>", "public" ] },
+    { include: [ "@\"(QtCore/)?qdir\\.h\"",                 "private", "<QDir>", "public" ] },
+    { include: [ "@\"(QtCore/)?qfile\\.h\"",                "private", "<QFile>", "public" ] },
+    { include: [ "@\"(QtCore/)?qfileinfo\\.h\"",            "private", "<QFileInfo>", "public" ] },
+    { include: [ "@\"(QtCore/)?qflags\\.h\"",               "private", "<QFlags>", "public" ] },
+    { include: [ "@\"(QtCore/)?qglobal\\.h\"",              "private", "<QtGlobal>", "public" ] },
+    { include: [ "@\"(QtCore/)?qiodevice\\.h\"",            "private", "<QIODevice>", "public" ] },
+    { include: [ "@\"(QtCore/)?qitemselectionmodel\\.h\"",  "private", "<QItemSelectionModel>", "public" ] },
+    { include: [ "@\"(QtCore/)?qjsonvalue\\.h\"",           "private", "<QJsonValue>", "public" ] },
+    { include: [ "@\"(QtCore/)?qlist\\.h\"",                "private", "<QList>", "public" ] },
+    { include: [ "@\"(QtCore/)?qlocale\\.h\"",              "private", "<QLocale>", "public" ] },
+    { include: [ "@\"(QtCore/)?qlogging\\.h\"",             "private", "<QtDebug>", "public" ] },
+    { include: [ "@\"(QtCore/)?qmap\\.h\"",                 "private", "<QMap>", "public" ] },
+    { include: [ "@\"(QtCore/)?qnamespace\\.h\"",           "private", "<Qt>", "public" ] },
+    { include: [ "@\"(QtCore/)?qobject\\.h\"",              "private", "<QObject>", "public" ] },
+    { include: [ "@\"(QtCore/)?qobjectdefs\\.h\"",          "private", "<QObject>", "public" ] },
+    { include: [ "@\"(QtCore/)?qpoint\\.h\"",               "private", "<QPoint>", "public" ] },
+    { include: [ "@\"(QtCore/)?qrect\\.h\"",                "private", "<QRect>", "public" ] },
+    { include: [ "@\"(QtCore/)?qregexp\\.h\"",              "private", "<QRegExp>", "public" ] },
+    { include: [ "@\"(QtCore/)?qscopedpointer\\.h\"",       "private", "<QScopedPointer>", "public" ] },
+    { include: [ "@\"(QtCore/)?qset\\.h\"",                 "private", "<QSet>", "public" ] },
+    { include: [ "@\"(QtCore/)?qsharedpointer_impl\\.h\"",  "private", "<QSharedPointer>", "public" ] },
+    { include: [ "@\"(QtCore/)?qsize\\.h\"",                "private", "<QSize>", "public" ] },
+    { include: [ "@\"(QtCore/)?qstring\\.h\"",              "private", "<QString>", "public" ] },
+    { include: [ "@\"(QtCore/)?qstringlist\\.h\"",          "private", "<QStringList>", "public" ] },
+    { include: [ "@\"(QtCore/)?qurl\\.h\"",                 "private", "<QUrl>", "public" ] },
+    { include: [ "@\"(QtCore/)?qvariant\\.h\"",             "private", "<QVariant>", "public" ] },
+
+    { include: [ "@\"(QtGui/)?qbrush\\.h\"",                "private", "<QBrush>", "public" ] },
+    { include: [ "@\"(QtGui/)?qcolor\\.h\"",                "private", "<QColor>", "public" ] },
+    { include: [ "@\"(QtGui/)?qfont\\.h\"",                 "private", "<QFont>", "public" ] },
+    { include: [ "@\"(QtGui/)?qicon\\.h\"",                 "private", "<QIcon>", "public" ] },
+    { include: [ "@\"(QtGui/)?qimage\\.h\"",                "private", "<QImage>", "public" ] },
+    { include: [ "@\"(QtGui/)?qkeysequence\\.h\"",          "private", "<QKeySequence>", "public" ] },
+    { include: [ "@\"(QtGui/)?qpalette\\.h\"",              "private", "<QPalette>", "public" ] },
+    { include: [ "@\"(QtGui/)?qpen\\.h\"",                  "private", "<QPen>", "public" ] },
+    { include: [ "@\"(QtGui/)?qpixmap\\.h\"",               "private", "<QPixmap>", "public" ] },
+
+    { include: [ "@\"(QtNetwork/)?qnetworkaccessmanager\\.h\"", "private", "<QNetworkAccessManager>", "public" ] },
+    { include: [ "@\"(QtNetwork/)?qnetworkrequest\\.h\"",   "private", "<QNetworkRequest>", "public" ] },
+    { include: [ "@\"(QtNetwork/)?qhostaddress\\.h\"",      "private", "<QHostAddress>", "public" ] },
+
+    { include: [ "\"QtWebKit/qwebsettings.h\"",             "private", "<QWebSettings>", "public" ] },
+
+    { include: [ "@\"(QtWidgets/)?qabstractbutton\\.h\"",   "private", "<QAbstractButton>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qabstractitemview\\.h\"", "private", "<QAbstractItemView>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qaction\\.h\"",           "private", "<QAction>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qboxlayout\\.h\"",        "private", "<QBoxLayout>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qdialog\\.h\"",           "private", "<QDialog>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qframe\\.h\"",            "private", "<QFrame>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qlayout\\.h\"",           "private", "<QLayout>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qlayoutitem\\.h\"",       "private", "<QLayoutItem>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qlineedit\\.h\"",         "private", "<QLineEdit>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qstyle\\.h\"",            "private", "<QStyle>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qstyleoption\\.h\"",      "private", "<QStyleOption>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qtabwidget\\.h\"",        "private", "<QTabWidget>", "public" ] },
+    { include: [ "@\"(QtWidgets/)?qwidget\\.h\"",           "private", "<QWidget>", "public" ] },
+
+    { include: [ "\"qabstractproxymodel.h\"",               "private", "<QAbstractProxyModel>", "public" ] },
+    { include: [ "\"qapplication.h\"",                      "private", "<QApplication>", "public" ] },
+    { include: [ "\"qcheckbox.h\"",                         "private", "<QCheckBox>", "public" ] },
+    { include: [ "\"qclipboard.h\"",                        "private", "<QClipboard>", "public" ] },
+    { include: [ "\"qcombobox.h\"",                         "private", "<QComboBox>", "public" ] },
+    { include: [ "\"qcommandlinkbutton.h\"",                "private", "<QCommandLinkButton>", "public" ] },
+    { include: [ "\"qcryptographichash.h\"",                "private", "<QCryptographicHash>", "public" ] },
+    { include: [ "\"qdatetime.h\"",                         "private", "<QDateTime>", "public" ] },
+    { include: [ "\"qdebug.h\"",                            "private", "<QDebug>", "public" ] },
+    { include: [ "\"qdesktopwidget.h\"",                    "private", "<QDesktopWidget>", "public" ] },
+    { include: [ "\"qdialog.h\"",                           "private", "<QDialog>", "public" ] },
+    { include: [ "\"qdialogbuttonbox.h\"",                  "private", "<QDialogButtonBox>", "public" ] },
+    { include: [ "\"qdiriterator.h\"",                      "private", "<QDirIterator>", "public" ] },
+    { include: [ "\"qfiledialog.h\"",                       "private", "<QFileDialog>", "public" ] },
+    { include: [ "\"qfilesystemmodel.h\"",                  "private", "<QFileSystemModel>", "public" ] },
+    { include: [ "\"qfilesystemwatcher.h\"",                "private", "<QFileSystemWatcher>", "public" ] },
+    { include: [ "\"qhash.h\"",                             "private", "<QHash>", "public" ] },
+    { include: [ "\"qheaderview.h\"",                       "private", "<QHeaderView>", "public" ] },
+    { include: [ "\"qinputdialog.h\"",                      "private", "<QInputDialog>", "public" ] },
+    { include: [ "\"qitemdelegate.h\"",                     "private", "<QItemDelegate>", "public" ] },
+    { include: [ "\"qjsonarray.h\"",                        "private", "<QJsonArray>", "public" ] },
+    { include: [ "\"qjsondocument.h\"",                     "private", "<QJsonDocument>", "public" ] },
+    { include: [ "\"qlabel.h\"",                            "private", "<QLabel>", "public" ] },
+    { include: [ "\"qlibrary.h\"",                          "private", "<QLibrary>", "public" ] },
+    { include: [ "\"qlistwidget.h\"",                       "private", "<QListWidget>", "public" ] },
+    { include: [ "\"qlocalserver.h\"",                      "private", "<QLocalServer>", "public" ] },
+    { include: [ "\"qlocalsocket.h\"",                      "private", "<QLocalSocket>", "public" ] },
+    { include: [ "\"qmainwindow.h\"",                       "private", "<QMainWindow>", "public" ] },
+    { include: [ "\"qmenu.h\"",                             "private", "<QMenu>", "public" ] },
+    { include: [ "\"qmessagebox.h\"",                       "private", "<QMessageBox>", "public" ] },
+    { include: [ "\"qmetatype.h\"",                         "private", "<QMetaType>", "public" ] },
+    { include: [ "\"qmimedata.h\"",                         "private", "<QMimeData>", "public" ] },
+    { include: [ "\"qmutex.h\"",                            "private", "<QMutex>", "public" ] },
+    { include: [ "\"qnetworkcookie.h\"",                    "private", "<QNetworkCookie>", "public" ] },
+    { include: [ "\"qnetworkcookiejar.h\"",                 "private", "<QNetworkCookieJar>", "public" ] },
+    { include: [ "\"qnetworkinterface.h\"",                 "private", "<QNetworkInterface>", "public" ] },
+    { include: [ "\"qnetworkreply.h\"",                     "private", "<QNetworkReply>", "public" ] },
+    { include: [ "\"qpainter.h\"",                          "private", "<QPainter>", "public" ] },
+    { include: [ "\"qprocess.h\"",                          "private", "<QProcess>", "public" ] },
+    { include: [ "\"qprogressbar.h\"",                      "private", "<QProgressBar>", "public" ] },
+    { include: [ "\"qprogressdialog.h\"",                   "private", "<QProgressDialog>", "public" ] },
+    { include: [ "\"qproxystyle.h\"",                       "private", "<QProxyStyle>", "public" ] },
+    { include: [ "\"qpushbutton.h\"",                       "private", "<QPushButton>", "public" ] },
+    { include: [ "\"qregexp.h\"",                           "private", "<QRegExp>", "public" ] },
+    { include: [ "\"qscrollbar.h\"",                        "private", "<QScrollBar>", "public" ] },
+    { include: [ "\"qsettings.h\"",                         "private", "<QSettings>", "public" ] },
+    { include: [ "\"qsharedmemory.h\"",                     "private", "<QSharedMemory>", "public" ] },
+    { include: [ "\"qshortcut.h\"",                         "private", "<QShortcut>", "public" ] },
+    { include: [ "\"qsortfilterproxymodel.h\"",             "private", "<QSortFilterProxyModel>", "public" ] },
+    { include: [ "\"qstackedwidget.h\"",                    "private", "<QStackedWidget>", "public" ] },
+    { include: [ "\"qstyleditemdelegate.h\"",               "private", "<QStyledItemDelegate>", "public" ] },
+    { include: [ "\"qstylefactory.h\"",                     "private", "<QStyleFactory>", "public" ] },
+    { include: [ "\"qtablewidget.h\"",                      "private", "<QTableWidget>", "public" ] },
+    { include: [ "\"qtemporaryfile.h\"",                    "private", "<QTemporaryFile>", "public" ] },
+    { include: [ "\"qtextbrowser.h\"",                      "private", "<QTextBrowser>", "public" ] },
+    { include: [ "\"qtextcodec.h\"",                        "private", "<QTextCodec>", "public" ] },
+    { include: [ "\"qtextedit.h\"",                         "private", "<QTextEdit>", "public" ] },
+    { include: [ "\"qtextstream.h\"",                       "private", "<QTextStream>", "public" ] },
+    { include: [ "\"qthread.h\"",                           "private", "<QThread>", "public" ] },
+    { include: [ "\"qtimer.h\"",                            "private", "<QTimer>", "public" ] },
+    { include: [ "\"qtreeview.h\"",                         "private", "<QTreeView>", "public" ] },
+    { include: [ "\"qtreewidget.h\"",                       "private", "<QTreeWidget>", "public" ] },
+    { include: [ "\"qurlquery.h\"",                         "private", "<QUrlQuery>", "public" ] },
+    { include: [ "\"qvalidator.h\"",                        "private", "<QValidator>", "public" ] },
+    { include: [ "\"qwebframe.h\"",                         "private", "<QWebFrame>", "public" ] },
+    { include: [ "\"qwebhistory.h\"",                       "private", "<QWebHistory>", "public" ] },
+    { include: [ "\"qwebpage.h\"",                          "private", "<QWebPage>", "public" ] },
+    { include: [ "\"qwebview.h\"",                          "private", "<QWebView>", "public" ] },
+    { include: [ "\"qwhatsthis.h\"",                        "private", "<QWhatsThis>", "public" ] },
+    { include: [ "\"qnetworkdiskcache.h\"",                 "private", "<QNetworkDiskCache>", "public" ] },
+    { include: [ "\"qmimedata.h\"",                         "private", "<QMimeData>", "public" ] },
+    { include: [ "\"qtgroupingproxy.h\"",                   "private", "<QtGroupingProxy>", "public" ] },
+
+# Microsft visual C?
+
+    { include: [ "<xstring>", "private", "<string>", "public" ] },
+    { include: [ "<xutility>", "private", "<utility>", "public" ] },
+    { include: [ "<xmemory0>", "private", "<memory>", "public" ] },
+
+# Windows
+
+    { include: [ "<winbase.h>", "private", "<windows.h>", "public" ] },
+    { include: [ "<minwinbase.h>", "private", "<windows.h>", "public" ] },
+    { include: [ "<errhandlingapi.h>", "private", "<windows.h>", "public" ] },
+    { include: [ "<winuser.h>", "private", "<windows.h>", "public" ] },
+
+# And for boost???
+
+]
+
+
+
+
+
+#include "QtCore/qiterator.h"
+#include "QtCore/qtypeinfo.h"       // for swap
+#include "QtCore/qtypetraits.h"      // for remove_reference<>::type
+#include "QtGui/qfontmetrics.h"
+#include "QtGui/qwindowdefs_win.h"  // for HINSTANCE
+#include <xmemory0>                 // for _Simple_types<>::value_type
+#include <xtree>                          // for _Tree_const_iterator
diff --git a/scons_configure_template.py b/scons_configure_template.py
index 67a8fad6..e4116adf 100644
--- a/scons_configure_template.py
+++ b/scons_configure_template.py
@@ -31,3 +31,6 @@ ZLIBPATH = r"C:\Apps\zlib-1.2.8"
 # though you have to set it up in the configuration
 GIT = r"C:\Program Files\git\bin\git.exe"
 MERCURIAL = r"C:\Program Files\TortoiseHg\hg.exe"
+
+# Path to include-what-you-use. This is currently rather experimental
+#IWYU = r"C:\Apps\include-what-you-use\bin\include-what-you-use.exe"
diff --git a/src/SConscript b/src/SConscript
index f09db093..cd2d8a52 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',
@@ -114,8 +113,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()
@@ -143,6 +143,14 @@ env.AppendUnique(LIBS = 'zlibstatic')
 prog = env.Program('ModOrganizer',
                    cpp_files + env.Glob('*.qrc') + other_sources)
 
+###############################################################################
+# I'd like to automatically add this to every .o generation.
+if 'IWYU' in env:
+    for f in cpp_files + [ env.File('aboutdialog.cpp') ]:
+        env.AddPostAction(prog, "-$IWYU $IWYU_FLAGS -Xiwyu --mapping_file=$IWYU_MAPPING_FILE $IWYU_COMCOM " + str(f))
+    env.Depends(prog, env['IWYU_MAPPING_FILE'])
+###############################################################################
+
 env.InstallModule(prog)
 
 for subdir in ('tutorials', 'stylesheets'):
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 c382c112..5e6bec00 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -25,8 +25,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "report.h"
 #include "persistentcookiejar.h"
 
-#include "json.h"
-
 #include <utility.h>
 #include <gameinfo.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 bc78cdc6..1aaf4122 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -25,7 +25,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 4d06bea9..c01955f2 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 e0d888e6..ae64b81f 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -25,7 +25,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "report.h"
 #include "modinfodialog.h"
 #include "overwriteinfodialog.h"
-#include "json.h"
 #include "messagedialog.h"
 #include "filenamestring.h"
 
diff --git a/src/modinfo.h b/src/modinfo.h
index da97b09b..d9de60e8 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -1047,7 +1047,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; }
@@ -1099,7 +1099,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/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 0763bb71..6ec282f6 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -25,7 +25,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "persistentcookiejar.h"
 #include "settings.h"
 #include <gameinfo.h>
-#include <json.h>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QNetworkProxy>
diff --git a/src/settings.cpp b/src/settings.cpp
index 4c2a34c8..b51ba71e 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -22,7 +22,6 @@ 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>
diff --git a/src/settings.h b/src/settings.h
index def1dc5c..580ffe42 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);
-- 
cgit v1.3.1