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/setupitem.cpp | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/widgets/setupitem.cpp')
| -rw-r--r-- | src/gui/widgets/setupitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 82d5132a3..3a1db94bd 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -50,7 +50,7 @@ SetupItem::SetupItem(std::string text, std::string description, std::string keyName, SetupTabScroll *const parent, std::string eventName, const bool mainConfig) : - ActionListener(), + gcn::ActionListener(), mText(text), mDescription(description), mKeyName(keyName), @@ -69,7 +69,7 @@ SetupItem::SetupItem(std::string text, std::string description, std::string keyName, SetupTabScroll *const parent, std::string eventName, std::string def, const bool mainConfig) : - ActionListener(), + gcn::ActionListener(), mText(text), mDescription(description), mKeyName(keyName), |