aboutsummaryrefslogtreecommitdiff
path: root/gui/options.h
diff options
context:
space:
mode:
authorlubomyr2017-02-14 15:13:58 +0200
committerlubomyr2017-02-14 15:13:58 +0200
commit216f9c4f11cd95f9e4ed049c9ecc97304e83f837 (patch)
treed28adb26dca57181721d175e435b3140daba813d /gui/options.h
parentf8c4274f1a0bdde91123f3cd493d14e5a1b1a91e (diff)
downloadscummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.tar.gz
scummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.tar.bz2
scummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.zip
ANDROIDSDL: backend related checking in options.cpp replaced with hasFeature... condition, renamed some fields and methods
Diffstat (limited to 'gui/options.h')
-rw-r--r--gui/options.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/gui/options.h b/gui/options.h
index 3189c91982..cb86e265bb 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -86,9 +86,8 @@ protected:
virtual void clean();
void rebuild();
-#ifdef ANDROIDSDL
- void addAndroidSdlControls(GuiObject *boss, const Common::String &prefix);
-#endif
+
+ void addControlControls(GuiObject *boss, const Common::String &prefix);
void addGraphicControls(GuiObject *boss, const Common::String &prefix);
void addAudioControls(GuiObject *boss, const Common::String &prefix);
void addMIDIControls(GuiObject *boss, const Common::String &prefix);
@@ -116,15 +115,13 @@ protected:
private:
-#ifdef ANDROIDSDL
//
- // AndroidSDL controls
+ // Control controls
//
- bool _enableAndroidSdlSettings;
+ bool _enableControlSettings;
CheckboxWidget *_touchpadCheckbox;
CheckboxWidget *_onscreenCheckbox;
-#endif
//
// Graphics controls