diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeEngine.cpp | 2 | ||||
-rw-r--r-- | gui/options.cpp | 4 | ||||
-rw-r--r-- | gui/widget.cpp | 6 | ||||
-rw-r--r-- | gui/widget.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 91e32ce1e8..6c2d8f1f7f 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -1229,7 +1229,7 @@ void ThemeEngine::restoreState(StoredState *state) { src += state->backBuffer.pitch; dst += _backBuffer.pitch; } - + addDirtyRect(state->r); } diff --git a/gui/options.cpp b/gui/options.cpp index 856eb668fa..0553e5910a 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -790,7 +790,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se return true; if (_domain != Common::ConfigManager::kApplicationDomain || ConfMan.hasKey(setting, _domain) || preferredType) { - const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain); + const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain); const MusicPlugin::List p = MusicMan.getPlugins(); for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { @@ -810,7 +810,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting) { if (!popup || !_enableAudioSettings) return; - + const MusicPlugin::List p = MusicMan.getPlugins(); bool found = false; for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end() && !found; ++m) { diff --git a/gui/widget.cpp b/gui/widget.cpp index 14cb61006b..6dd79c9d4f 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -218,9 +218,9 @@ Common::String Widget::cleanupHotkey(const Common::String &label) { for (uint i = 0; i < label.size() ; i++) if (label[i] != '~') res = res + label[i]; - + return res; -} +} #pragma mark - @@ -361,7 +361,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Co } ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey) - : StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss), + : StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss), _cmd(cmd) { if (hotkey == 0) _hotkey = parseHotkey(label); diff --git a/gui/widget.h b/gui/widget.h index 7b5fe9253f..25e4b9a235 100644 --- a/gui/widget.h +++ b/gui/widget.h @@ -164,7 +164,7 @@ class GuiManager; class Tooltip : public GuiObject { public: Tooltip(GuiManager *guiManager); - + bool isVisible() const { return _visible; } void draw(); void reflowLayout(); @@ -272,7 +272,7 @@ class RadiobuttonWidget : public ButtonWidget { protected: bool _state; int _value; - + public: RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0); RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0); |