Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix some override warnings.

Browse Source
This commit is contained in:
Unknown W. Brackets committed 2016-10-01 11:23:24 -07:00
1 parent 1c3e048070
commit 6ac166b05f
2 files changed
+30 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/MainScreen.h
+8 -8
View File
@@ -73,17 +73,17 @@ public:
MainScreen();
~MainScreen();
virtual bool isTopLevel() const { return true; }
bool isTopLevel() const override { return true; }
// Horrible hack to show the demos & homebrew tab after having installed a game from a zip file.
static bool showHomebrewTab;
protected:
virtual void CreateViews();
virtual void DrawBackground(UIContext &dc);
virtual void update(InputState &input);
virtual void sendMessage(const char *message, const char *value);
virtual void dialogFinished(const Screen *dialog, DialogResult result);
void CreateViews() override;
void DrawBackground(UIContext &dc) override;
void update(InputState &input) override;
void sendMessage(const char *message, const char *value) override;
void dialogFinished(const Screen *dialog, DialogResult result) override;
bool UseVerticalLayout() const;
bool DrawBackgroundFor(UIContext &dc, const std::string &gamePath, float progress);
@@ -127,8 +127,8 @@ public:
UmdReplaceScreen() {}
protected:
virtual void CreateViews();
virtual void update(InputState &input);
void CreateViews() override;
void update(InputState &input) override;
//virtual void sendMessage(const char *message, const char *value);
private:
UI/MiscScreens.h
+22 -22
View File
@@ -35,17 +35,17 @@ class UIScreenWithBackground : public UIScreen {
public:
UIScreenWithBackground() : UIScreen() {}
protected:
virtual void DrawBackground(UIContext &dc) override;
virtual void sendMessage(const char *message, const char *value) override;
virtual UI::EventReturn OnLanguageChange(UI::EventParams &e);
void DrawBackground(UIContext &dc) override;
void sendMessage(const char *message, const char *value) override;
UI::EventReturn OnLanguageChange(UI::EventParams &e);
};
class UIScreenWithGameBackground : public UIScreenWithBackground {
public:
UIScreenWithGameBackground(const std::string &gamePath)
: UIScreenWithBackground(), gamePath_(gamePath) {}
virtual void DrawBackground(UIContext &dc);
virtual void sendMessage(const char *message, const char *value) override;
void DrawBackground(UIContext &dc) override;
void sendMessage(const char *message, const char *value) override;
protected:
std::string gamePath_;
};
@@ -54,9 +54,9 @@ class UIDialogScreenWithBackground : public UIDialogScreen {
public:
UIDialogScreenWithBackground() : UIDialogScreen() {}
protected:
virtual void DrawBackground(UIContext &dc) override;
virtual void sendMessage(const char *message, const char *value) override;
virtual UI::EventReturn OnLanguageChange(UI::EventParams &e);
void DrawBackground(UIContext &dc) override;
void sendMessage(const char *message, const char *value) override;
UI::EventReturn OnLanguageChange(UI::EventParams &e);
void AddStandardBack(UI::ViewGroup *parent);
};
@@ -65,8 +65,8 @@ class UIDialogScreenWithGameBackground : public UIDialogScreenWithBackground {
public:
UIDialogScreenWithGameBackground(const std::string &gamePath)
: UIDialogScreenWithBackground(), gamePath_(gamePath) {}
virtual void DrawBackground(UIContext &dc) override;
virtual void sendMessage(const char *message, const char *value) override;
void DrawBackground(UIContext &dc) override;
void sendMessage(const char *message, const char *value) override;
protected:
std::string gamePath_;
};
@@ -76,7 +76,7 @@ public:
PromptScreen(std::string message, std::string yesButtonText, std::string noButtonText,
std::function<void(bool)> callback = &NoOpVoidBool);
virtual void CreateViews() override;
void CreateViews() override;
private:
UI::EventReturn OnYes(UI::EventParams &e);
@@ -93,8 +93,8 @@ public:
NewLanguageScreen(const std::string &title);
private:
virtual void OnCompleted(DialogResult result) override;
virtual bool ShowButtons() const override { return true; }
void OnCompleted(DialogResult result) override;
bool ShowButtons() const override { return true; }
std::map<std::string, std::pair<std::string, int>> langValuesMapping;
std::map<std::string, std::string> titleCodeMapping;
std::vector<FileInfo> langs_;
@@ -105,8 +105,8 @@ public:
PostProcScreen(const std::string &title);
private:
virtual void OnCompleted(DialogResult result) override;
virtual bool ShowButtons() const override { return true; }
void OnCompleted(DialogResult result) override;
bool ShowButtons() const override { return true; }
std::vector<ShaderInfo> shaders_;
};
@@ -115,10 +115,10 @@ public:
LogoScreen()
: frames_(0), switched_(false) {}
bool key(const KeyInput &key) override;
virtual void update(InputState &input) override;
virtual void render() override;
virtual void sendMessage(const char *message, const char *value) override;
virtual void CreateViews() override {}
void update(InputState &input) override;
void render() override;
void sendMessage(const char *message, const char *value) override;
void CreateViews() override {}
private:
void Next();
@@ -129,10 +129,10 @@ private:
class CreditsScreen : public UIDialogScreenWithBackground {
public:
CreditsScreen() : frames_(0) {}
virtual void update(InputState &input) override;
virtual void render() override;
void update(InputState &input) override;
void render() override;
virtual void CreateViews() override;
void CreateViews() override;
private:
UI::EventReturn OnOK(UI::EventParams &e);