From 63f0b730767b1185dc33f8892068d697e26a09bb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Feb 2014 14:59:26 +0300
Subject: Move Rectangle and ClipRectangle into gui directory.

---
 src/gui/widgets/guitable.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui/widgets/guitable.cpp')

diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 324d4b23e..7bd920046 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -304,7 +304,7 @@ void GuiTable::draw(Graphics* graphics)
     if (client->getGuiAlpha() != mAlpha)
         mAlpha = client->getGuiAlpha();
 
-    const gcn::Rectangle &rect = mDimension;
+    const Rectangle &rect = mDimension;
     const int width = rect.width;
     const int height = rect.height;
     const int y = rect.y;
@@ -312,7 +312,7 @@ void GuiTable::draw(Graphics* graphics)
     {
         mBackgroundColor.a = static_cast<int>(mAlpha * 255.0F);
         graphics->setColor(mBackgroundColor);
-        graphics->fillRectangle(gcn::Rectangle(0, 0, width, height));
+        graphics->fillRectangle(Rectangle(0, 0, width, height));
     }
 
     // First, determine how many rows we need to draw,
@@ -351,7 +351,7 @@ void GuiTable::draw(Graphics* graphics)
             const int cWidth = getColumnWidth(c);
             if (widget)
             {
-                gcn::Rectangle bounds(x_offset, y_offset, cWidth, rHeight);
+                Rectangle bounds(x_offset, y_offset, cWidth, rHeight);
 
                 if (widget == mTopWidget)
                 {
@@ -369,14 +369,14 @@ void GuiTable::draw(Graphics* graphics)
                     if (mLinewiseMode && r == static_cast<unsigned>(
                         mSelectedRow) && c == 0)
                     {
-                        graphics->fillRectangle(gcn::Rectangle(0, y_offset,
+                        graphics->fillRectangle(Rectangle(0, y_offset,
                             width, rHeight));
                     }
                     else if (!mLinewiseMode && mSelectedColumn > 0
                              && c == static_cast<unsigned>(mSelectedColumn)
                              && r == static_cast<unsigned>(mSelectedRow))
                     {
-                        graphics->fillRectangle(gcn::Rectangle(
+                        graphics->fillRectangle(Rectangle(
                             x_offset, y_offset, cWidth, rHeight));
                     }
                 }
@@ -393,7 +393,7 @@ void GuiTable::draw(Graphics* graphics)
 
     if (mTopWidget)
     {
-        const gcn::Rectangle &bounds = mTopWidget->getDimension();
+        const Rectangle &bounds = mTopWidget->getDimension();
         graphics->pushClipArea(bounds);
         mTopWidget->draw(graphics);
         graphics->popClipArea();
@@ -414,9 +414,9 @@ void GuiTable::moveToBottom(gcn::Widget *widget)
         mTopWidget = nullptr;
 }
 
-gcn::Rectangle GuiTable::getChildrenArea()
+Rectangle GuiTable::getChildrenArea()
 {
-    return gcn::Rectangle(0, 0, mDimension.width, mDimension.height);
+    return Rectangle(0, 0, mDimension.width, mDimension.height);
 }
 
 // -- KeyListener notifications
-- 
cgit v1.2.3-60-g2f50