diff options
author | Johannes Schickel | 2012-09-26 04:17:31 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-09-26 04:17:55 +0200 |
commit | 89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch) | |
tree | d60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /gui | |
parent | a6c6c74350bb673c178d9756a1625ca128d24f21 (diff) | |
download | scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2 scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip |
JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeParser.cpp | 4 | ||||
-rw-r--r-- | gui/ThemeParser.h | 2 | ||||
-rw-r--r-- | gui/launcher.cpp | 2 | ||||
-rw-r--r-- | gui/options.cpp | 2 | ||||
-rw-r--r-- | gui/predictivedialog.cpp | 18 | ||||
-rw-r--r-- | gui/saveload-dialog.cpp | 4 | ||||
-rw-r--r-- | gui/widget.cpp | 2 | ||||
-rw-r--r-- | gui/widgets/editable.h | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index 9a85399ed1..8285aff7ca 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -548,11 +548,11 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst else return parserError("'" + stepNode->values["fill"] + "' is not a valid fill mode for a shape."); } - + if (stepNode->values.contains("padding")) { val = stepNode->values["padding"]; int pr, pt, pl, pb; - if (parseIntegerKey(val, 4, &pl, &pt, &pr, &pb)) + if (parseIntegerKey(val, 4, &pl, &pt, &pr, &pb)) drawstep->padding.left = pl, drawstep->padding.top = pt, drawstep->padding.right = pr, diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h index 82f774b803..360e3da009 100644 --- a/gui/ThemeParser.h +++ b/gui/ThemeParser.h @@ -139,7 +139,7 @@ protected: XML_PROP(height, false) XML_PROP(xpos, false) XML_PROP(ypos, false) - XML_PROP(padding, false) + XML_PROP(padding, false) XML_PROP(orientation, false) XML_PROP(file, false) KEY_END() diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 26fafa5279..0f4867ced5 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -166,7 +166,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc) } else { warning("Plugin for target \"%s\" not found! Game specific settings might be missing", domain.c_str()); } - + // GAME: Path to game data (r/o), extra data (r/o), and save data (r/w) String gamePath(ConfMan.get("path", _domain)); String extraPath(ConfMan.get("extrapath", _domain)); diff --git a/gui/options.cpp b/gui/options.cpp index 4fc37c93da..4868f1876d 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -992,7 +992,7 @@ void OptionsDialog::addEngineControls(GuiObject *boss, const Common::String &pre ExtraGuiOptions::const_iterator iter; for (iter = engineOptions.begin(); iter != engineOptions.end(); ++iter, ++i) { Common::String id = Common::String::format("%d", i); - _engineCheckboxes.push_back(new CheckboxWidget(boss, + _engineCheckboxes.push_back(new CheckboxWidget(boss, prefix + "customOption" + id + "Checkbox", _(iter->label), _(iter->tooltip))); } } diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp index b827d49416..ed18847a40 100644 --- a/gui/predictivedialog.cpp +++ b/gui/predictivedialog.cpp @@ -71,7 +71,7 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") { _btns = (ButtonWidget **)calloc(1, sizeof(ButtonWidget *) * 16); - _btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd); + _btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd); _btns[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd); _btns[kBtn1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd); _btns[kBtn2Act] = new ButtonWidget(this, "Predictive.Button2", "2 abc" , 0, kBut2Cmd); @@ -84,10 +84,10 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") { _btns[kBtn9Act] = new ButtonWidget(this, "Predictive.Button9", "9 wxyz" , 0, kBut9Cmd); _btns[kBtn0Act] = new ButtonWidget(this, "Predictive.Button0", "0" , 0, kBut0Cmd); // I18N: You must leave "#" as is, only word 'next' is translatable - _btns[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd); + _btns[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd); _btns[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , 0, kAddCmd); _btns[kAddAct]->setEnabled(false); - + #ifndef DISABLE_FANCY_THEMES _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd); ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true); @@ -214,7 +214,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { _navigationwithkeys = true; if (_lastbutton == kBtn1Act || _lastbutton == kBtn4Act || _lastbutton == kBtn7Act) _currBtn = ButtonId(_lastbutton + 2); - else if (_lastbutton == kDelAct) + else if (_lastbutton == kDelAct) _currBtn = kBtn1Act; else if (_lastbutton == kModeAct) _currBtn = kNextAct; @@ -227,7 +227,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { else _currBtn = ButtonId(_lastbutton - 1); - + if (_mode != kModeAbc && _lastbutton == kCancelAct) _currBtn = kOkAct; @@ -237,7 +237,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { _navigationwithkeys = true; if (_lastbutton == kBtn3Act || _lastbutton == kBtn6Act || _lastbutton == kBtn9Act || _lastbutton == kOkAct) _currBtn = ButtonId(_lastbutton - 2); - else if (_lastbutton == kDelAct) + else if (_lastbutton == kDelAct) _currBtn = kBtn3Act; else if (_lastbutton == kBtn0Act) _currBtn = kNextAct; @@ -249,7 +249,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { _currBtn = kAddAct; else _currBtn = ButtonId(_lastbutton + 1); - + if (_mode != kModeAbc && _lastbutton == kOkAct) _currBtn = kCancelAct; _needRefresh = true; @@ -260,7 +260,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { _currBtn = kDelAct; else if (_lastbutton == kDelAct) _currBtn = kOkAct; - else if (_lastbutton == kModeAct) + else if (_lastbutton == kModeAct) _currBtn = kBtn7Act; else if (_lastbutton == kBtn0Act) _currBtn = kBtn8Act; @@ -286,7 +286,7 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) { _currBtn = kBtn0Act; else if (_lastbutton == kBtn9Act) _currBtn = kNextAct; - else if (_lastbutton == kModeAct) + else if (_lastbutton == kModeAct) _currBtn = kAddAct; else if (_lastbutton == kBtn0Act) _currBtn = kCancelAct; diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp index cd0f96d60c..be6cefda26 100644 --- a/gui/saveload-dialog.cpp +++ b/gui/saveload-dialog.cpp @@ -735,7 +735,7 @@ void SaveLoadChooserGrid::reflowLayout() { if (!_saveMode) { buttonCmd += 1; } - + PicButtonWidget *button = new PicButtonWidget(container, dstX, dstY, buttonWidth, buttonHeight, 0, buttonCmd); dstY += buttonHeight; @@ -788,7 +788,7 @@ int SaveLoadChooserGrid::runIntern() { } while (_saveMode && slot >= 0 && !selectDescription()); // Special case for new save games. We need to handle this here, since - // we cannot handle it in close() without problems. + // we cannot handle it in close() without problems. if (slot == _nextFreeSaveSlot) { ConfMan.setInt("gui_saveload_last_pos", slot); } diff --git a/gui/widget.cpp b/gui/widget.cpp index 9046bcc9c1..270cdc56de 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -366,7 +366,7 @@ void ButtonWidget::startAnimatePressedState() { } void ButtonWidget::wantTickle(bool tickled) { - if (tickled) + if (tickled) ((GUI::Dialog *)_boss)->setTickleWidget(this); else ((GUI::Dialog *)_boss)->unSetTickleWidget(); diff --git a/gui/widgets/editable.h b/gui/widgets/editable.h index 7e453c1204..4a18d5e689 100644 --- a/gui/widgets/editable.h +++ b/gui/widgets/editable.h @@ -77,10 +77,10 @@ public: protected: virtual void startEditMode() = 0; virtual void endEditMode() = 0; - virtual void abortEditMode() = 0; + virtual void abortEditMode() = 0; virtual Common::Rect getEditRect() const = 0; virtual int getCaretOffset() const; - void drawCaret(bool erase); + void drawCaret(bool erase); bool adjustOffset(); void makeCaretVisible(); |