diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:30:00 +0100 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-02-09 17:10:37 -0700 |
commit | 1db7d10787f462430054ba04110a8d4647bdbd0a (patch) | |
tree | 60dc4d04c738b1f54a41bc9d9b6d0e5ffb0fb1d4 /src/gui/window.cpp | |
parent | 1ae95b709235ce811ce72437aa257bb7500e00d0 (diff) | |
download | mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.gz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.bz2 mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.xz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.zip |
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/gui/window.cpp')
-rw-r--r-- | src/gui/window.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 934bd9b3..8000179d 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -75,7 +75,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std { logger->log("Window::Window(\"%s\")", caption.c_str()); - if (!windowContainer) + if (!windowContainer) { throw GCN_EXCEPTION("Window::Window(): no windowContainer set"); } @@ -126,7 +126,7 @@ Window::~Window() config.setValue(name + "WinY", getY()); config.setValue(name + "Visible", isVisible()); - if (mGrip) + if (mGrip) { config.setValue(name + "WinWidth", getWidth()); config.setValue(name + "WinHeight", getHeight()); @@ -145,7 +145,7 @@ Window::~Window() instances--; // Clean up static resources - for( int i = 0; i < 9; i++ ) + for (int i = 0; i < 9; i++) { delete border.grid[i]; border.grid[i] = NULL; @@ -525,7 +525,7 @@ int Window::getResizeHandles(gcn::MouseEvent &event) void Window::setGuiAlpha() { //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8)); - for(int i = 0; i < 9; i++) + for (int i = 0; i < 9; i++) { //logger->log("Window::setGuiAlpha: Border Image (%i)", i); border.grid[i]->setAlpha(config.getValue("guialpha", 0.8)); @@ -534,7 +534,7 @@ void Window::setGuiAlpha() mAlphaChanged = false; } -void Window::loadSkin(const std::string filename) +void Window::loadSkin(const std::string &filename) { const std::string windowId = Window::getId(); @@ -544,7 +544,7 @@ void Window::loadSkin(const std::string filename) logger->log("Loading Window ID '%s'.", windowId.c_str()); - if(filename == "") + if (filename.empty()) logger->error("Window::loadSkin(): Invalid File Name."); // TODO: @@ -562,7 +562,7 @@ void Window::loadSkin(const std::string filename) std::string skinSetImage; skinSetImage = XML::getProperty(rootNode, "image", ""); Image *dBorders = NULL; - if(skinSetImage != "") + if (!skinSetImage.empty()) { logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str()); dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png"); @@ -596,7 +596,7 @@ void Window::loadSkin(const std::string filename) std::string partType; partType = XML::getProperty(partNode, "type", "unknown"); // TOP ROW - if(partType == "top-left-corner") + if (partType == "top-left-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -605,7 +605,7 @@ void Window::loadSkin(const std::string filename) border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "top-edge") + else if (partType == "top-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -614,7 +614,7 @@ void Window::loadSkin(const std::string filename) border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "top-right-corner") + else if (partType == "top-right-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -625,7 +625,7 @@ void Window::loadSkin(const std::string filename) } // MIDDLE ROW - else if(partType == "left-edge") + else if (partType == "left-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -634,7 +634,7 @@ void Window::loadSkin(const std::string filename) border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bg-quad") + else if (partType == "bg-quad") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -643,7 +643,7 @@ void Window::loadSkin(const std::string filename) border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "right-edge") + else if (partType == "right-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -654,7 +654,7 @@ void Window::loadSkin(const std::string filename) } // BOTTOM ROW - else if(partType == "bottom-left-corner") + else if (partType == "bottom-left-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -663,7 +663,7 @@ void Window::loadSkin(const std::string filename) border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bottom-edge") + else if (partType == "bottom-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -672,7 +672,7 @@ void Window::loadSkin(const std::string filename) border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bottom-right-corner") + else if (partType == "bottom-right-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); |