diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 11:27:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 12:34:23 +0300 |
commit | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch) | |
tree | ba2d006e8aaac74138eb13ba458d30abf8f01182 /src/guichan/widgets | |
parent | 9569f124d176b4220f28f9a41812c33883737228 (diff) | |
download | ManaVerse-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz ManaVerse-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2 ManaVerse-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz ManaVerse-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip |
some more style fixes from cpplint.
Diffstat (limited to 'src/guichan/widgets')
-rw-r--r-- | src/guichan/widgets/button.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/checkbox.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/container.cpp | 3 | ||||
-rw-r--r-- | src/guichan/widgets/label.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/listbox.cpp | 4 | ||||
-rw-r--r-- | src/guichan/widgets/radiobutton.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/scrollarea.cpp | 13 | ||||
-rw-r--r-- | src/guichan/widgets/slider.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/textbox.cpp | 5 | ||||
-rw-r--r-- | src/guichan/widgets/textfield.cpp | 2 | ||||
-rw-r--r-- | src/guichan/widgets/window.cpp | 2 |
11 files changed, 16 insertions, 23 deletions
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp index 8c0cf0f96..6ea6c8f3a 100644 --- a/src/guichan/widgets/button.cpp +++ b/src/guichan/widgets/button.cpp @@ -171,4 +171,4 @@ namespace gcn mMousePressed = false; mKeyPressed = false; } -} +} // namespace gcn diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp index 420345eda..4e76e75d2 100644 --- a/src/guichan/widgets/checkbox.cpp +++ b/src/guichan/widgets/checkbox.cpp @@ -130,4 +130,4 @@ namespace gcn mSelected = !mSelected; distributeActionEvent(); } -} +} // namespace gcn diff --git a/src/guichan/widgets/container.cpp b/src/guichan/widgets/container.cpp index e3bbeb995..19f992519 100644 --- a/src/guichan/widgets/container.cpp +++ b/src/guichan/widgets/container.cpp @@ -64,7 +64,6 @@ namespace gcn Container::~Container() { - } void Container::draw(Graphics* graphics) @@ -115,4 +114,4 @@ namespace gcn { return BasicContainer::findWidgetById(id); } -} +} // namespace gcn diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp index 9dce2bff9..db1ea6e8a 100644 --- a/src/guichan/widgets/label.cpp +++ b/src/guichan/widgets/label.cpp @@ -98,4 +98,4 @@ namespace gcn void Label::adjustSize() { } -} +} // namespace gcn diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp index 834a4bb82..938d82721 100644 --- a/src/guichan/widgets/listbox.cpp +++ b/src/guichan/widgets/listbox.cpp @@ -196,7 +196,7 @@ namespace gcn { mSelectionListeners.push_back(selectionListener); } - + void ListBox::removeSelectionListener(SelectionListener* selectionListener) { mSelectionListeners.remove(selectionListener); @@ -217,4 +217,4 @@ namespace gcn { return getFont()->getHeight(); } -} +} // namespace gcn diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp index 75136eb01..9be0b75c9 100644 --- a/src/guichan/widgets/radiobutton.cpp +++ b/src/guichan/widgets/radiobutton.cpp @@ -184,4 +184,4 @@ namespace gcn void RadioButton::adjustSize() { } -} +} // namespace gcn diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp index 67154fbad..6874e41c9 100644 --- a/src/guichan/widgets/scrollarea.cpp +++ b/src/guichan/widgets/scrollarea.cpp @@ -414,7 +414,7 @@ namespace gcn { mHBarVisible = (getContent()->getWidth() > w); } - else // (mVPolicy == SHOW_ALWAYS) + else // (mVPolicy == SHOW_ALWAYS) { mHBarVisible = (getContent()->getWidth() > w - mScrollbarWidth); @@ -440,7 +440,7 @@ namespace gcn { mVBarVisible = (getContent()->getHeight() > h); } - else // (mHPolicy == SHOW_ALWAYS) + else // (mHPolicy == SHOW_ALWAYS) { mVBarVisible = (getContent()->getHeight() > h - mScrollbarWidth); @@ -455,7 +455,7 @@ namespace gcn { const Rectangle area = Rectangle(0, 0, mVBarVisible ? (getWidth() - mScrollbarWidth) : getWidth(), - mHBarVisible ? (getHeight() - mScrollbarWidth) : getHeight()); + mHBarVisible ? (getHeight() - mScrollbarWidth) : getHeight()); if (area.width < 0 || area.height < 0) return Rectangle(); @@ -569,13 +569,8 @@ namespace gcn mOpaque = opaque; } - bool ScrollArea::isOpaque() const { return mOpaque; } -} - -/* - * Wow! This is a looooong source file. - */ +} // namespace gcn diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp index 4e94d82ea..7611fdfd7 100644 --- a/src/guichan/widgets/slider.cpp +++ b/src/guichan/widgets/slider.cpp @@ -270,4 +270,4 @@ namespace gcn mouseEvent.consume(); } -} +} // namespace gcn diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp index c858c7ede..bfb6aff89 100644 --- a/src/guichan/widgets/textbox.cpp +++ b/src/guichan/widgets/textbox.cpp @@ -112,7 +112,6 @@ namespace gcn std::string sub = text.substr(lastPos, length); mTextRows.push_back(sub); lastPos = pos + 1; - } while (pos != std::string::npos); adjustSize(); @@ -176,7 +175,7 @@ namespace gcn { mCaretRow = row; mCaretColumn = position; - return; // we are done + return; // we are done } else { @@ -319,4 +318,4 @@ namespace gcn { mOpaque = opaque; } -} +} // namespace gcn diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp index 1dcf74215..7d9bd87f6 100644 --- a/src/guichan/widgets/textfield.cpp +++ b/src/guichan/widgets/textfield.cpp @@ -142,4 +142,4 @@ namespace gcn void TextField::fontChanged() { } -} +} // namespace gcn diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp index e541ef242..f04a47e9e 100644 --- a/src/guichan/widgets/window.cpp +++ b/src/guichan/widgets/window.cpp @@ -210,4 +210,4 @@ namespace gcn setSize(w + 2* getPadding(), h + getPadding() + getTitleBarHeight()); } -} +} // namespace gcn |