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/icon.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/icon.cpp')
| -rw-r--r-- | src/gui/widgets/icon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 0236cde6a..e8893a5f7 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -30,7 +30,7 @@ #include "debug.h" Icon::Icon(const std::string &file) : - Widget(), + gcn::Widget(), mImage(ResourceManager::getInstance()->getImage(file)) { if (mImage) @@ -38,7 +38,7 @@ Icon::Icon(const std::string &file) : } Icon::Icon(Image *const image) : - Widget(), + gcn::Widget(), mImage(image) { if (mImage) |