Permalink
Browse files

UI: Fix some virtual override warnings.

  • Loading branch information...
unknownbrackets committed Dec 4, 2017
1 parent f607f41 commit 20c9d0edea9c3e3708812025e9c6ac71b208ad0e
Showing with 17 additions and 17 deletions.
  1. +2 −2 UI/ComboKeyMappingScreen.h
  2. +2 −2 UI/CwCheatScreen.h
  3. +1 −1 UI/DevScreens.h
  4. +2 −2 UI/GameScreen.h
  5. +6 −6 UI/GameSettingsScreen.h
  6. +4 −4 UI/TouchControlVisibilityScreen.h
@@ -29,8 +29,8 @@ class Combo_keyScreen : public UIDialogScreenWithBackground {
public:
Combo_keyScreen(int *key): mode(key) {}
virtual void CreateViews();
virtual void onFinish(DialogResult result);
void CreateViews() override;
void onFinish(DialogResult result) override;
UI::EventReturn onCombo(UI::EventParams &e);
private:
std::map<std::string, bool*> keyToggles;
@@ -39,9 +39,9 @@ class CwCheatScreen : public UIDialogScreenWithBackground {
UI::EventReturn OnEditCheatFile(UI::EventParams &params);
UI::EventReturn OnEnableAll(UI::EventParams &params);
virtual void onFinish(DialogResult result);
void onFinish(DialogResult result) override;
protected:
virtual void CreateViews();
void CreateViews() override;
private:
UI::EventReturn OnCheckBox(UI::EventParams &params);
@@ -87,7 +87,7 @@ class LogLevelScreen : public ListPopupScreen {
class SystemInfoScreen : public UIDialogScreenWithBackground {
public:
SystemInfoScreen() {}
virtual void CreateViews();
void CreateViews() override;
};
class AddressPromptScreen : public PopupScreen {
@@ -33,12 +33,12 @@ class GameScreen : public UIDialogScreenWithGameBackground {
GameScreen(const std::string &gamePath);
~GameScreen();
virtual void update();
void update() override;
std::string tag() const override { return "game"; }
protected:
virtual void CreateViews();
void CreateViews() override;
void CallbackDeleteConfig(bool yes);
void CallbackDeleteSaveData(bool yes);
void CallbackDeleteGame(bool yes);
@@ -28,14 +28,14 @@ class GameSettingsScreen : public UIDialogScreenWithGameBackground {
public:
GameSettingsScreen(std::string gamePath, std::string gameID = "", bool editThenRestore = false);
virtual void update();
virtual void onFinish(DialogResult result);
void update() override;
void onFinish(DialogResult result) override;
std::string tag() const override { return "settings"; }
UI::Event OnRecentChanged;
protected:
virtual void CreateViews();
void CreateViews() override;
void CallbackRestoreDefaults(bool yes);
void CallbackRenderingBackend(bool yes);
bool UseVerticalLayout() const;
@@ -140,10 +140,10 @@ class SettingInfoMessage : public UI::LinearLayout {
class DeveloperToolsScreen : public UIDialogScreenWithBackground {
public:
DeveloperToolsScreen() {}
virtual void onFinish(DialogResult result);
void onFinish(DialogResult result) override;
protected:
virtual void CreateViews();
void CreateViews() override;
private:
UI::EventReturn OnBack(UI::EventParams &e);
@@ -161,7 +161,7 @@ class ProAdhocServerScreen : public UIDialogScreenWithBackground {
ProAdhocServerScreen() {}
protected:
virtual void CreateViews();
void CreateViews() override;
private:
std::string tempProAdhocServer;
@@ -29,14 +29,14 @@ class TouchControlVisibilityScreen : public UIDialogScreenWithBackground {
public:
TouchControlVisibilityScreen() : toggleSwitch(true){ }
virtual void CreateViews();
virtual void onFinish(DialogResult result);
void CreateViews() override;
void onFinish(DialogResult result) override;
protected:
virtual UI::EventReturn OnToggleAll(UI::EventParams &e);
UI::EventReturn OnToggleAll(UI::EventParams &e);
private:
std::map<std::string, bool*> keyToggles;
std::map<std::string, bool *> keyToggles;
bool toggleSwitch;
class ChoiceEventHandler{

0 comments on commit 20c9d0e

Please sign in to comment.