aboutsummaryrefslogtreecommitdiff
path: root/backends/wince/CEgui
diff options
context:
space:
mode:
authorEugene Sandulenko2005-07-30 21:11:48 +0000
committerEugene Sandulenko2005-07-30 21:11:48 +0000
commit6b4484472b79dc7ea7d1ce545a28fba7d3b7696f (patch)
treec44c4e61f18ddd537f7082cb48869cf33d422fbd /backends/wince/CEgui
parent86ab70b149e5cd00cf54f2e41896e2c4e16795e4 (diff)
downloadscummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.gz
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.bz2
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.zip
Remove trailing whitespaces.
svn-id: r18604
Diffstat (limited to 'backends/wince/CEgui')
-rw-r--r--backends/wince/CEgui/GUIElement.cpp6
-rw-r--r--backends/wince/CEgui/GUIElement.h12
-rw-r--r--backends/wince/CEgui/ItemAction.cpp6
-rw-r--r--backends/wince/CEgui/ItemAction.h2
-rw-r--r--backends/wince/CEgui/ItemSwitch.cpp10
-rw-r--r--backends/wince/CEgui/ItemSwitch.h4
-rw-r--r--backends/wince/CEgui/Panel.cpp2
-rw-r--r--backends/wince/CEgui/Panel.h6
-rw-r--r--backends/wince/CEgui/PanelItem.cpp2
-rw-r--r--backends/wince/CEgui/PanelKeyboard.cpp6
-rw-r--r--backends/wince/CEgui/PanelKeyboard.h2
-rw-r--r--backends/wince/CEgui/SDL_ImageResource.cpp6
-rw-r--r--backends/wince/CEgui/Toolbar.cpp4
-rw-r--r--backends/wince/CEgui/Toolbar.h4
-rw-r--r--backends/wince/CEgui/ToolbarHandler.cpp4
-rw-r--r--backends/wince/CEgui/ToolbarHandler.h2
16 files changed, 39 insertions, 39 deletions
diff --git a/backends/wince/CEgui/GUIElement.cpp b/backends/wince/CEgui/GUIElement.cpp
index b5732f4653..ae5292660d 100644
--- a/backends/wince/CEgui/GUIElement.cpp
+++ b/backends/wince/CEgui/GUIElement.cpp
@@ -42,7 +42,7 @@ namespace CEGUI {
_height = _background->height();
_width = _background->width();
}
- else
+ else
if (_background->height() != _height || _background->width() != _width) {
delete _background;
_background = NULL;
@@ -50,7 +50,7 @@ namespace CEGUI {
}
return true;
}
-
+
void GUIElement::move(int x, int y) {
_x = x;
_y = y;
@@ -79,7 +79,7 @@ namespace CEGUI {
if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
return true;
else
- return false;
+ return false;
}
void GUIElement::setVisible(bool visibility) {
diff --git a/backends/wince/CEgui/GUIElement.h b/backends/wince/CEgui/GUIElement.h
index 86ba3c4fcd..cbd955cef2 100644
--- a/backends/wince/CEgui/GUIElement.h
+++ b/backends/wince/CEgui/GUIElement.h
@@ -33,29 +33,29 @@
namespace CEGUI {
class GUIElement {
- public:
- bool setBackground(WORD backgroundReference);
+ public:
+ bool setBackground(WORD backgroundReference);
void setVisible(bool visibility);
virtual void forceRedraw();
- virtual bool draw(SDL_Surface *surface);
+ virtual bool draw(SDL_Surface *surface);
virtual ~GUIElement();
void move(int x, int y);
int width();
int height();
int x();
int y();
- virtual bool action(int x, int y, bool pushed) = 0;
+ virtual bool action(int x, int y, bool pushed) = 0;
bool visible();
bool drawn();
protected:
GUIElement(int x = 0, int y = 0, int width = 0, int height = 0);
bool checkInside(int x, int y);
bool _visible;
- SDL_ImageResource *_background;
+ SDL_ImageResource *_background;
int _x;
int _y;
bool _drawn;
- private:
+ private:
int _width;
int _height;
};
diff --git a/backends/wince/CEgui/ItemAction.cpp b/backends/wince/CEgui/ItemAction.cpp
index bc9dfeaec0..6aaa739198 100644
--- a/backends/wince/CEgui/ItemAction.cpp
+++ b/backends/wince/CEgui/ItemAction.cpp
@@ -30,9 +30,9 @@ namespace CEGUI {
if (!GUI::Actions::Instance()->isEnabled(_action))
_visible = false;
}
-
-
- ItemAction::~ItemAction() {
+
+
+ ItemAction::~ItemAction() {
}
bool ItemAction::action(int x, int y, bool pushed) {
diff --git a/backends/wince/CEgui/ItemAction.h b/backends/wince/CEgui/ItemAction.h
index df38842bcb..b9d773452a 100644
--- a/backends/wince/CEgui/ItemAction.h
+++ b/backends/wince/CEgui/ItemAction.h
@@ -34,7 +34,7 @@ namespace CEGUI {
public:
ItemAction(WORD reference, GUI::ActionType action);
virtual ~ItemAction();
- virtual bool action(int x, int y, bool pushed);
+ virtual bool action(int x, int y, bool pushed);
private:
GUI::ActionType _action;
};
diff --git a/backends/wince/CEgui/ItemSwitch.cpp b/backends/wince/CEgui/ItemSwitch.cpp
index 6ee05f941f..a4a4503ec7 100644
--- a/backends/wince/CEgui/ItemSwitch.cpp
+++ b/backends/wince/CEgui/ItemSwitch.cpp
@@ -37,10 +37,10 @@ namespace CEGUI {
}
if (!*_item)
_background = _backgroundFalse;
- }
-
-
- ItemSwitch::~ItemSwitch() {
+ }
+
+
+ ItemSwitch::~ItemSwitch() {
if (_backgroundFalse)
delete _backgroundFalse;
}
@@ -53,7 +53,7 @@ namespace CEGUI {
_background = _backgroundTrue;
else
_background = _backgroundFalse;
-
+
if (_panel)
_panel->forceRedraw();
diff --git a/backends/wince/CEgui/ItemSwitch.h b/backends/wince/CEgui/ItemSwitch.h
index e8377031d9..4754ff9bd6 100644
--- a/backends/wince/CEgui/ItemSwitch.h
+++ b/backends/wince/CEgui/ItemSwitch.h
@@ -37,11 +37,11 @@ namespace CEGUI {
public:
ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
virtual ~ItemSwitch();
- virtual bool action(int x, int y, bool pushed);
+ virtual bool action(int x, int y, bool pushed);
private:
bool *_item;
SDL_ImageResource *_backgroundTrue;
- SDL_ImageResource *_backgroundFalse;
+ SDL_ImageResource *_backgroundFalse;
};
}
diff --git a/backends/wince/CEgui/Panel.cpp b/backends/wince/CEgui/Panel.cpp
index a76c202690..8764fb685f 100644
--- a/backends/wince/CEgui/Panel.cpp
+++ b/backends/wince/CEgui/Panel.cpp
@@ -67,7 +67,7 @@ namespace CEGUI {
if (!_visible || !checkInside(x, y))
return false;
- for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
+ for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
return result;
}
diff --git a/backends/wince/CEgui/Panel.h b/backends/wince/CEgui/Panel.h
index 4abe5a0685..cf8195d95c 100644
--- a/backends/wince/CEgui/Panel.h
+++ b/backends/wince/CEgui/Panel.h
@@ -39,15 +39,15 @@ namespace CEGUI {
class Panel : public Toolbar {
public:
Panel(int interleave_first, int interleave);
- virtual bool draw(SDL_Surface *surface);
+ virtual bool draw(SDL_Surface *surface);
virtual ~Panel();
bool add(const String &name, const PanelItem *item);
void clear();
virtual void forceRedraw();
- virtual bool action(int x, int y, bool pushed);
+ virtual bool action(int x, int y, bool pushed);
private:
struct IgnoreCaseComparator {
- int operator()(const String& x, const String& y) const {
+ int operator()(const String& x, const String& y) const {
return scumm_stricmp(x.c_str(), y.c_str()); }
};
diff --git a/backends/wince/CEgui/PanelItem.cpp b/backends/wince/CEgui/PanelItem.cpp
index 6d0cd1c5aa..59f16320dd 100644
--- a/backends/wince/CEgui/PanelItem.cpp
+++ b/backends/wince/CEgui/PanelItem.cpp
@@ -29,7 +29,7 @@ namespace CEGUI {
_panel = NULL;
}
-
+
PanelItem::~PanelItem() {
}
diff --git a/backends/wince/CEgui/PanelKeyboard.cpp b/backends/wince/CEgui/PanelKeyboard.cpp
index a7c43f3c68..782c6b45f5 100644
--- a/backends/wince/CEgui/PanelKeyboard.cpp
+++ b/backends/wince/CEgui/PanelKeyboard.cpp
@@ -31,9 +31,9 @@ namespace CEGUI {
PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
setBackground(reference);
- }
+ }
+
-
PanelKeyboard::~PanelKeyboard() {
}
@@ -44,7 +44,7 @@ namespace CEGUI {
char keyCode = 0;
if (x < 185) {
// Alpha selection
- if (y <= _y + 20)
+ if (y <= _y + 20)
keyAscii = KEYBOARD_MAPPING_ALPHA_HIGH[((x + 10) / 14) - 1];
else
keyAscii = KEYBOARD_MAPPING_ALPHA_LOW[((x + 10) / 14) - 1];
diff --git a/backends/wince/CEgui/PanelKeyboard.h b/backends/wince/CEgui/PanelKeyboard.h
index f4c48bf659..e803a6f058 100644
--- a/backends/wince/CEgui/PanelKeyboard.h
+++ b/backends/wince/CEgui/PanelKeyboard.h
@@ -37,7 +37,7 @@ namespace CEGUI {
class PanelKeyboard : public Toolbar {
public:
PanelKeyboard(WORD reference);
- virtual ~PanelKeyboard();
+ virtual ~PanelKeyboard();
virtual bool action(int x, int y, bool pushed);
private:
Key _key;
diff --git a/backends/wince/CEgui/SDL_ImageResource.cpp b/backends/wince/CEgui/SDL_ImageResource.cpp
index 598caa56a1..bffafc2241 100644
--- a/backends/wince/CEgui/SDL_ImageResource.cpp
+++ b/backends/wince/CEgui/SDL_ImageResource.cpp
@@ -24,7 +24,7 @@
namespace CEGUI {
- SDL_ImageResource::SDL_ImageResource() :
+ SDL_ImageResource::SDL_ImageResource() :
_surface(0)
{
}
@@ -36,7 +36,7 @@ namespace CEGUI {
DWORD resourceSize;
SDL_RWops *surfaceData;
HMODULE moduleHandle;
-
+
moduleHandle = GetModuleHandle(NULL);
resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
if (!resource)
@@ -78,5 +78,5 @@ namespace CEGUI {
SDL_ImageResource::~SDL_ImageResource() {
if (_surface)
SDL_FreeSurface(_surface);
- }
+ }
}
diff --git a/backends/wince/CEgui/Toolbar.cpp b/backends/wince/CEgui/Toolbar.cpp
index e2829b1aa6..e64314ed13 100644
--- a/backends/wince/CEgui/Toolbar.cpp
+++ b/backends/wince/CEgui/Toolbar.cpp
@@ -24,12 +24,12 @@
namespace CEGUI {
- // Not to be drawn on game screen !
+ // Not to be drawn on game screen !
Toolbar::Toolbar() : GUIElement(0, 0, 320, 40)
{
}
-
+
Toolbar::~Toolbar() {
}
}
diff --git a/backends/wince/CEgui/Toolbar.h b/backends/wince/CEgui/Toolbar.h
index 965d72a3c0..98d3b7623a 100644
--- a/backends/wince/CEgui/Toolbar.h
+++ b/backends/wince/CEgui/Toolbar.h
@@ -36,12 +36,12 @@
namespace CEGUI {
class Toolbar : public GUIElement {
- public:
+ public:
virtual ~Toolbar();
virtual bool action(int x, int y, bool pushed) = 0;
protected:
Toolbar();
-
+
};
}
diff --git a/backends/wince/CEgui/ToolbarHandler.cpp b/backends/wince/CEgui/ToolbarHandler.cpp
index b747247f36..4a3622260e 100644
--- a/backends/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/wince/CEgui/ToolbarHandler.cpp
@@ -33,7 +33,7 @@ namespace CEGUI {
_toolbarMap.addKey(name);
_toolbarMap[name] = (Toolbar*)&toolbar;
-
+
if (!_active) {
_active = &((Toolbar&)toolbar);
_current = name;
@@ -63,7 +63,7 @@ namespace CEGUI {
if (_offset > 240)
return _active->action(x / 2, (y - _offset) / 2, pushed);
else
- return _active->action(x, y - _offset, pushed);
+ return _active->action(x, y - _offset, pushed);
}
else
return false;
diff --git a/backends/wince/CEgui/ToolbarHandler.h b/backends/wince/CEgui/ToolbarHandler.h
index 5b255fccf6..f4ae710b00 100644
--- a/backends/wince/CEgui/ToolbarHandler.h
+++ b/backends/wince/CEgui/ToolbarHandler.h
@@ -54,7 +54,7 @@ namespace CEGUI {
private:
struct IgnoreCaseComparator {
- int operator()(const String& x, const String& y) const {
+ int operator()(const String& x, const String& y) const {
return scumm_stricmp(x.c_str(), y.c_str()); }
};