From 10badd2c0e099c7611f6d23b3973e54f210bc172 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 Oct 2012 15:15:19 +0300
Subject: Fix namespace conflicts.

---
 src/gui/widgets/tabbedarea.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b1d0ca35e..d41af4542 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -40,12 +40,10 @@ TabbedArea::TabbedArea() :
     gcn::KeyListener(),
     gcn::MouseListener(),
     gcn::WidgetListener(),
-
     mSelectedTab(nullptr),
     mTabContainer(new gcn::Container()),
     mWidgetContainer(new gcn::Container()),
     mOpaque(false),
-
     mTabsWidth(0),
     mVisibleTabsWidth(0),
     mTabScrollIndex(0),
@@ -509,7 +507,7 @@ void TabbedArea::adjustTabPositions()
 
 void TabbedArea::action(const gcn::ActionEvent& actionEvent)
 {
-    Widget *const source = actionEvent.getSource();
+    gcn::Widget *const source = actionEvent.getSource();
     Tab *const tab = dynamic_cast<Tab *const>(source);
 
     if (tab)
@@ -597,7 +595,7 @@ void TabbedArea::removeAll()
     {
         const int idx = getNumberOfTabs() - 1;
         Tab *tab = mTabs[idx].first;
-        Widget *widget = mTabs[idx].second;
+        gcn::Widget *widget = mTabs[idx].second;
         removeTab(tab);
         delete tab;
         delete widget;
-- 
cgit v1.2.3-60-g2f50