mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-19 10:41:36 +00:00
Merge branch 'modernize_use_override_for_most_apps' into 'master'
Using override keyword in most apps See merge request OpenMW/openmw!886
This commit is contained in:
commit
b2acb322af
7 changed files with 7 additions and 7 deletions
|
@ -27,7 +27,7 @@ namespace ESSImport
|
||||||
|
|
||||||
void load(ESM::ESMReader& esm) override;
|
void load(ESM::ESMReader& esm) override;
|
||||||
|
|
||||||
virtual ~CellRef() = default;
|
~CellRef() override = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ namespace Launcher
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit MainDialog(QWidget *parent = nullptr);
|
explicit MainDialog(QWidget *parent = nullptr);
|
||||||
~MainDialog();
|
~MainDialog() override;
|
||||||
|
|
||||||
FirstRunDialogResult showFirstRunDialog();
|
FirstRunDialogResult showFirstRunDialog();
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace Launcher
|
||||||
public:
|
public:
|
||||||
SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
|
SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
|
||||||
Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
|
Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
|
||||||
~SettingsPage();
|
~SettingsPage() override;
|
||||||
|
|
||||||
void saveSettings();
|
void saveSettings();
|
||||||
bool loadSettings();
|
bool loadSettings();
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace Launcher
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
|
explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
|
||||||
~TextInputDialog ();
|
~TextInputDialog () override;
|
||||||
|
|
||||||
inline LineEdit *lineEdit() { return mLineEdit; }
|
inline LineEdit *lineEdit() { return mLineEdit; }
|
||||||
void setOkButtonEnabled(bool enabled);
|
void setOkButtonEnabled(bool enabled);
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace Wizard
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
InstallationPage(QWidget *parent);
|
InstallationPage(QWidget *parent);
|
||||||
~InstallationPage();
|
~InstallationPage() override;
|
||||||
|
|
||||||
int nextId() const override;
|
int nextId() const override;
|
||||||
bool isComplete() const override;
|
bool isComplete() const override;
|
||||||
|
|
|
@ -40,7 +40,7 @@ namespace Wizard
|
||||||
};
|
};
|
||||||
|
|
||||||
MainWizard(QWidget *parent = nullptr);
|
MainWizard(QWidget *parent = nullptr);
|
||||||
~MainWizard();
|
~MainWizard() override;
|
||||||
|
|
||||||
bool findFiles(const QString &name, const QString &path);
|
bool findFiles(const QString &name, const QString &path);
|
||||||
void addInstallation(const QString &path);
|
void addInstallation(const QString &path);
|
||||||
|
|
|
@ -27,7 +27,7 @@ namespace Wizard
|
||||||
|
|
||||||
public:
|
public:
|
||||||
UnshieldWorker(QObject *parent = nullptr);
|
UnshieldWorker(QObject *parent = nullptr);
|
||||||
~UnshieldWorker();
|
~UnshieldWorker() override;
|
||||||
|
|
||||||
void stopWorker();
|
void stopWorker();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue