diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:59:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:59:58 +0300 |
| commit | ab5a67829ec6c80accfeb4f186a70886c82c8dba (patch) | |
| tree | c017d3a20ec4275254d92eaa126b4eb73acb00b3 | |
| parent | 775810f943f7f6540d3bb180fdb91a074fdbaa75 (diff) | |
| download | manaplus-ab5a67829ec6c80accfeb4f186a70886c82c8dba.tar.gz manaplus-ab5a67829ec6c80accfeb4f186a70886c82c8dba.tar.bz2 manaplus-ab5a67829ec6c80accfeb4f186a70886c82c8dba.tar.xz manaplus-ab5a67829ec6c80accfeb4f186a70886c82c8dba.zip | |
Move extendednamesmodel into gui/models directory.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/models/extendednamesmodel.cpp (renamed from src/gui/widgets/extendednamesmodel.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/models/extendednamesmodel.h (renamed from src/gui/widgets/extendednamesmodel.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 3 |
5 files changed, 10 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 72bff6ee1..9e13f9098 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,8 +139,8 @@ SET(SRCS gui/widgets/extendedlistbox.cpp gui/widgets/extendedlistbox.h gui/models/extendedlistmodel.h - gui/widgets/extendednamesmodel.cpp - gui/widgets/extendednamesmodel.h + gui/models/extendednamesmodel.cpp + gui/models/extendednamesmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h gui/widgets/tabs/gmtab.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 2179818d7..5622d0a42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -235,8 +235,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/extendedlistbox.cpp \ gui/widgets/extendedlistbox.h \ gui/models/extendedlistmodel.h \ - gui/widgets/extendednamesmodel.cpp \ - gui/widgets/extendednamesmodel.h \ + gui/models/extendednamesmodel.cpp \ + gui/models/extendednamesmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ gui/widgets/tabs/gmtab.cpp \ diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp index a8a21d98d..c986085db 100644 --- a/src/gui/widgets/extendednamesmodel.cpp +++ b/src/gui/models/extendednamesmodel.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/extendednamesmodel.h" +#include "gui/models/extendednamesmodel.h" #include "debug.h" diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h index 3c38c48ed..383a93951 100644 --- a/src/gui/widgets/extendednamesmodel.h +++ b/src/gui/models/extendednamesmodel.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_EXTENDEDNAMESMODEL_H -#define GUI_WIDGETS_EXTENDEDNAMESMODEL_H +#ifndef GUI_MODELS_EXTENDEDNAMESMODEL_H +#define GUI_MODELS_EXTENDEDNAMESMODEL_H #include "utils/stringvector.h" @@ -56,4 +56,4 @@ class ExtendedNamesModel : public ExtendedListModel std::vector<Image*> mImages; }; -#endif // GUI_WIDGETS_EXTENDEDNAMESMODEL_H +#endif // GUI_MODELS_EXTENDEDNAMESMODEL_H diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index d62ca36ad..1ee78e563 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -29,11 +29,12 @@ #include "gui/font.h" #include "gui/gui.h" +#include "gui/models/extendednamesmodel.h" + #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" #include "gui/widgets/extendedlistbox.h" -#include "gui/widgets/extendednamesmodel.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" |