diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:26:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:26:52 +0300 |
commit | 5fc6d9e0f9637e3aaa71972478bee9febbe78ca7 (patch) | |
tree | 0b65e519506388e0f4c225ab585b85c84aa03a55 /src/gui/widgets/setupitem.h | |
parent | 4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06 (diff) | |
download | manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.gz manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.bz2 manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.tar.xz manaplus-5fc6d9e0f9637e3aaa71972478bee9febbe78ca7.zip |
Move listmodel into gui/modesl directory.
Diffstat (limited to 'src/gui/widgets/setupitem.h')
-rw-r--r-- | src/gui/widgets/setupitem.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 18e838cdf..51f2eb94e 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -36,16 +36,12 @@ class EditDialog; class HorizontContainer; class IntTextField; class Label; +class ListModel; class SetupTabScroll; class Slider; class SliderList; class TextField; -namespace gcn -{ - class ListModel; -} - class SetupItem : public ActionListener, public Widget2 { @@ -315,7 +311,7 @@ class SetupItemDropDown final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const int width, const bool mainConfig = true); SetupItemDropDown(const std::string &restrict text, @@ -323,7 +319,7 @@ class SetupItemDropDown final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const int width, const std::string &restrict def, const bool mainConfig = true); @@ -341,7 +337,7 @@ class SetupItemDropDown final : public SetupItem protected: HorizontContainer *mHorizont; Label *mLabel; - gcn::ListModel *mModel; + ListModel *mModel; DropDown *mDropDown; int mWidth; }; @@ -483,7 +479,7 @@ class SetupItemSliderList : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const int width = 150, const bool onTheFly = false, const bool mainConfig = true); @@ -492,7 +488,7 @@ class SetupItemSliderList : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const std::string &restrict def, const int width = 150, const bool onTheFly = false, @@ -501,7 +497,7 @@ class SetupItemSliderList : public SetupItem HorizontContainer *mHorizont; Label *mLabel; SliderList *mSlider; - gcn::ListModel *mModel; + ListModel *mModel; int mWidth; bool mOnTheFly; }; @@ -514,7 +510,7 @@ class SetupItemSound final : public SetupItemSliderList const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const int width = 150, const bool onTheFly = false, const bool mainConfig = true); @@ -537,7 +533,7 @@ class SetupItemSliderInt final : public SetupItemSliderList const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - gcn::ListModel *restrict const model, + ListModel *restrict const model, const int min, const int width = 150, const bool onTheFly = false, |