diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 15:15:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-19 16:39:56 +0300 |
| commit | 10badd2c0e099c7611f6d23b3973e54f210bc172 (patch) | |
| tree | 3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/widgets/tabbedarea.cpp | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/widgets/tabbedarea.cpp')
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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; |