More capitalization fixes for 'color'

Hopefully these are the last ones. :)

4 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 269f8fd1..372dbd17 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -47,11 +47,11 @@ Setup_Colors::Setup_Colors() :
 {
     setOpaque(false);
 
-    mcolorBox = new ListBox(textColor);
-    mcolorBox->setActionEventId("color_box");
-    mcolorBox->addActionListener(this);
+    mColorBox = new ListBox(textColor);
+    mColorBox->setActionEventId("color_box");
+    mColorBox->addActionListener(this);
 
-    mScroll = new ScrollArea(mcolorBox);
+    mScroll = new ScrollArea(mColorBox);
     mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
@@ -150,7 +150,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "color_box")
     {
-        mSelected = mcolorBox->getSelected();
+        mSelected = mColorBox->getSelected();
         int col = textColor->getColorAt(mSelected);
         char ch = textColor->getColorCharAt(mSelected);
         std::string msg;
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 1e56cfa8..8fd1ba59 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -48,7 +48,7 @@ class Setup_Colors : public SetupTab, public gcn::ActionListener,
 
         void listen(const TextField *tf);
     private:
-        gcn::ListBox *mcolorBox;
+        gcn::ListBox *mColorBox;
         gcn::ScrollArea *mScroll;
         BrowserBox *mPreview;
         gcn::ScrollArea *mPreviewBox;
diff --git a/src/text.cpp b/src/text.cpp
index 5d88bd69..c4559879 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -39,7 +39,7 @@ Text::Text(const std::string &text, int x, int y,
            gcn::Graphics::Alignment alignment,
            gcn::Color color, bool isSpeech) :
     mText(text),
-    mcolor(color),
+    mColor(color),
     mIsSpeech(isSpeech)
 {
     if (textManager == 0)
@@ -161,7 +161,7 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
                 gcn::Graphics::LEFT);
     }
 
-    graphics->setColor(mcolor);
+    graphics->setColor(mColor);
     graphics->drawText(mText, mX - xOff, mY - yOff,
             gcn::Graphics::LEFT);
 }
diff --git a/src/text.h b/src/text.h
index 550c00a5..6e121da7 100644
--- a/src/text.h
+++ b/src/text.h
@@ -65,7 +65,7 @@ class Text
         int mXOffset;          /**< The offset of mX from the desired x. */
         static int mInstances; /**< Instances of text. */
         std::string mText;     /**< The text to display. */
-        gcn::Color mcolor;    /**< The color of the text. */
+        gcn::Color mColor;     /**< The color of the text. */
         bool mIsSpeech;        /**< Is this text a speech bubble? */
 
     protected: