summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-24 19:51:16 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-26 22:38:41 +0100
commitbd7ad9aedd87c857477bbfcf7653af91a80f4df6 (patch)
tree6e0c678f37ebf7b0c020ec95773c79c552834140 /src/gui
parent20c224aacc6b9669828f3c7e7b2c19b9b95d90ff (diff)
downloadmana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.gz
mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.bz2
mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.xz
mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.zip
Removed 'inline' keyword where it's not of any value
Members that are implemented inline are already inline, there is no need to mark them as such. Made two inline members of OpenGLGraphics private since because they are marked as inline, they can't be used from other classes. Reviewed-by: Erik Schilling
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/listbox.h2
-rw-r--r--src/gui/widgets/textbox.h4
-rw-r--r--src/gui/widgets/textpreview.h14
-rw-r--r--src/gui/windowmenu.h8
4 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 61c564bb..a887a351 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -45,7 +45,7 @@ class ListBox : public gcn::ListBox
*
* @param font the font to use.
*/
- inline void setFont(gcn::Font *font)
+ void setFont(gcn::Font *font)
{
mFont = font;
}
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 6b947e0b..548f2734 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -36,7 +36,7 @@ class TextBox : public gcn::TextBox
public:
TextBox();
- inline void setTextColor(const gcn::Color *color)
+ void setTextColor(const gcn::Color *color)
{ mTextColor = color; }
/**
@@ -52,7 +52,7 @@ class TextBox : public gcn::TextBox
/**
* Draws the text.
*/
- inline void draw(gcn::Graphics *graphics)
+ void draw(gcn::Graphics *graphics)
{
setForegroundColor(*mTextColor);
gcn::TextBox::draw(graphics);
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 2be88ae7..8fa63691 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -39,7 +39,7 @@ class TextPreview : public gcn::Widget
*
* @param color the color to set
*/
- inline void setTextColor(const gcn::Color *color)
+ void setTextColor(const gcn::Color *color)
{
mTextColor = color;
}
@@ -49,7 +49,7 @@ class TextPreview : public gcn::Widget
*
* @param alpha whether to use alpha values for the text or not
*/
- inline void useTextAlpha(bool alpha)
+ void useTextAlpha(bool alpha)
{
mTextAlpha = alpha;
}
@@ -60,7 +60,7 @@ class TextPreview : public gcn::Widget
*
* @param color the color to set
*/
- inline void setTextBGColor(const gcn::Color *color)
+ void setTextBGColor(const gcn::Color *color)
{
mTextBGColor = color;
}
@@ -70,7 +70,7 @@ class TextPreview : public gcn::Widget
*
* @param color the color to set
*/
- inline void setBGColor(const gcn::Color *color)
+ void setBGColor(const gcn::Color *color)
{
mBGColor = color;
}
@@ -80,7 +80,7 @@ class TextPreview : public gcn::Widget
*
* @param font the font to use.
*/
- inline void setFont(gcn::Font *font)
+ void setFont(gcn::Font *font)
{
mFont = font;
}
@@ -90,7 +90,7 @@ class TextPreview : public gcn::Widget
*
* @param shadow true, if a shadow is wanted, false else
*/
- inline void setShadow(bool shadow)
+ void setShadow(bool shadow)
{
mShadow = shadow;
}
@@ -100,7 +100,7 @@ class TextPreview : public gcn::Widget
*
* @param outline true, if an outline is wanted, false else
*/
- inline void setOutline(bool outline)
+ void setOutline(bool outline)
{
mOutline = outline;
}
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 962abaf5..427c31b9 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -55,10 +55,10 @@ class WindowMenu : public Container,
void updatePopUpCaptions();
private:
- inline void addButton(const std::string& text, int &x, int &h,
- const std::string& iconPath = std::string(),
- KeyboardConfig::KeyAction key =
- KeyboardConfig::KEY_NO_VALUE);
+ void addButton(const std::string& text, int &x, int &h,
+ const std::string& iconPath = std::string(),
+ KeyboardConfig::KeyAction key =
+ KeyboardConfig::KEY_NO_VALUE);
EmotePopup *mEmotePopup;
};