Remove deadcode.

apps/launcher/advancedpage.cpp

@@ -10,11 +10,9 @@
 
 #include <cmath>
 
-Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg,
-                                     Config::GameSettings &gameSettings,
+Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings,
                                      Settings::Manager &engineSettings, QWidget *parent)
         : QWidget(parent)
-        , mCfgMgr(cfg)
         , mGameSettings(gameSettings)
         , mEngineSettings(engineSettings)
 {

apps/launcher/advancedpage.hpp

@@ -9,7 +9,6 @@
 
 #include <components/settings/settings.hpp>
 
-namespace Files { struct ConfigurationManager; }
 namespace Config { class GameSettings; }
 
 namespace Launcher
@@ -19,7 +18,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
+        AdvancedPage(Config::GameSettings &gameSettings,
                      Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
@@ -35,7 +34,6 @@ namespace Launcher
         void slotViewOverShoulderToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
         Config::GameSettings &mGameSettings;
         Settings::Manager &mEngineSettings;
         QCompleter mCellNameCompleter;

apps/launcher/datafilespage.hpp

@@ -88,11 +88,7 @@ namespace Launcher
         QStringList previousSelectedFiles;
         QString mDataLocal;
 
-        void setPluginsCheckstates(Qt::CheckState state);
-
         void buildView();
-        void setupConfig();
-        void readConfig();
         void setProfile (int index, bool savePrevious);
         void setProfile (const QString &previous, const QString &current, bool savePrevious);
         void removeProfile (const QString &profile);

apps/launcher/graphicspage.cpp

@@ -29,9 +29,8 @@ QString getAspect(int x, int y)
     return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
 }
 
-Launcher::GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent)
+Launcher::GraphicsPage::GraphicsPage(Settings::Manager &engineSettings, QWidget *parent)
     : QWidget(parent)
-    , mCfgMgr(cfg)
     , mEngineSettings(engineSettings)
 {
     setObjectName ("GraphicsPage");

apps/launcher/graphicspage.hpp

@@ -20,7 +20,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = nullptr);
+        GraphicsPage(Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
@@ -35,7 +35,6 @@ namespace Launcher
         void slotShadowDistLimitToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
         Settings::Manager &mEngineSettings;
 
         QVector<QStringList> mResolutionsPerScreen;

apps/launcher/maindialog.cpp

@@ -126,9 +126,9 @@ void Launcher::MainDialog::createPages()
 
     mPlayPage = new PlayPage(this);
     mDataFilesPage = new DataFilesPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mGraphicsPage = new GraphicsPage(mCfgMgr, mEngineSettings, this);
+    mGraphicsPage = new GraphicsPage(mEngineSettings, this);
     mSettingsPage = new SettingsPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mAdvancedPage = new AdvancedPage(mCfgMgr, mGameSettings, mEngineSettings, this);
+    mAdvancedPage = new AdvancedPage(mGameSettings, mEngineSettings, this);
 
     // Set the combobox of the play page to imitate the combobox on the datafilespage
     mPlayPage->setProfilesModel(mDataFilesPage->profilesModel());

apps/launcher/utils/cellnameloader.cpp

@@ -45,4 +45,5 @@ QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
     cell.loadNameAndData(esmReader, isDeleted);
 
     return QString::fromStdString(cell.mName);
-}
+}
+

components/config/gamesettings.cpp

@@ -14,8 +14,6 @@ Config::GameSettings::GameSettings(Files::ConfigurationManager &cfg)
 {
 }
 
-Config::GameSettings::~GameSettings() = default;
-
 void Config::GameSettings::validatePaths()
 {
     QStringList paths = mSettings.values(QString("data"));

components/config/gamesettings.hpp

@@ -21,7 +21,6 @@ namespace Config
     {
     public:
         GameSettings(Files::ConfigurationManager &cfg);
-        ~GameSettings();
 
         inline QString value(const QString &key, const QString &defaultValue = QString())
         {
@@ -54,11 +53,11 @@ namespace Config
             mUserSettings.remove(key);
         }
 
-        inline QStringList getDataDirs() { return mDataDirs; }
+        inline QStringList getDataDirs() const { return mDataDirs; }
 
         inline void removeDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.removeAll(dir); }
         inline void addDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.append(dir); }
-        inline QString getDataLocal() {return mDataLocal; }
+        inline QString getDataLocal() const {return mDataLocal; }
 
         bool hasMaster();
 

components/config/launchersettings.cpp

@@ -12,10 +12,6 @@ const char Config::LauncherSettings::sLauncherConfigFileName[] = "launcher.cfg";
 const char Config::LauncherSettings::sContentListsSectionPrefix[] = "Profiles/";
 const char Config::LauncherSettings::sContentListSuffix[] = "/content";
 
-Config::LauncherSettings::LauncherSettings() = default;
-
-Config::LauncherSettings::~LauncherSettings() = default;
-
 QStringList Config::LauncherSettings::subKeys(const QString &key)
 {
     QMultiMap<QString, QString> settings = SettingsBase::getSettings();

components/config/launchersettings.hpp

@@ -9,9 +9,6 @@ namespace Config
     class LauncherSettings : public SettingsBase<QMultiMap<QString, QString> >
     {
     public:
-        LauncherSettings();
-        ~LauncherSettings();
-
         bool writeFile(QTextStream &stream);
 
         /// \return names of all Content Lists in the launcher's .cfg file.