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/helpwindow.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/helpwindow.h')
-rw-r--r-- | src/gui/helpwindow.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index f7c8ff690..11598dd25 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -35,11 +35,7 @@ class BrowserBox; class LinkHandler; - -namespace gcn -{ - class ScrollArea; -} +class ScrollArea; typedef std::set<std::string> HelpNames; typedef HelpNames::const_iterator HelpNamesCIter; @@ -86,7 +82,7 @@ class HelpWindow final : public Window, public LinkHandler, void loadFile(const std::string &file); BrowserBox *mBrowserBox; - gcn::ScrollArea *mScrollArea; + ScrollArea *mScrollArea; HelpTagsMap mTagFileMap; }; |