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/setup_relations.h | |
parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
download | manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.zip |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/setup_relations.h')
-rw-r--r-- | src/gui/setup_relations.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 8e83cf22c..83b72ba97 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -35,12 +35,12 @@ class DropDown; class EditDialog; class GuiTable; class PlayerTableModel; +class ScrollArea; class StaticTableModel; namespace gcn { class ListModel; - class ScrollArea; } class Setup_Relations final : public SetupTab, @@ -72,7 +72,7 @@ private: PlayerTableModel *mPlayerTableModel; GuiTable *mPlayerTable; GuiTable *mPlayerTitleTable; - gcn::ScrollArea *mPlayerScrollArea; + ScrollArea *mPlayerScrollArea; CheckBox *mDefaultTrading; CheckBox *mDefaultWhisper; |