diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:30:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 16:44:21 +0300 |
| commit | 7432738d75d02147e2aaa1d577383d26a9e18296 (patch) | |
| tree | 63f22206794e84aba6df56ba7cf0a83009fa86cf /src | |
| parent | 5fc6d9e0f9637e3aaa71972478bee9febbe78ca7 (diff) | |
| download | manaverse-7432738d75d02147e2aaa1d577383d26a9e18296.tar.gz manaverse-7432738d75d02147e2aaa1d577383d26a9e18296.tar.bz2 manaverse-7432738d75d02147e2aaa1d577383d26a9e18296.tar.xz manaverse-7432738d75d02147e2aaa1d577383d26a9e18296.zip | |
Move colormodel into gui/models directory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/models/colormodel.cpp (renamed from src/gui/widgets/colormodel.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/models/colormodel.h (renamed from src/gui/widgets/colormodel.h) | 6 | ||||
| -rw-r--r-- | src/gui/widgets/colorpage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/emotewindow.cpp | 3 |
6 files changed, 11 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 497b66cd9..d2d7effde 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,8 +124,8 @@ SET(SRCS gui/widgets/tabs/chattab.h gui/widgets/checkbox.cpp gui/widgets/checkbox.h - gui/widgets/colormodel.cpp - gui/widgets/colormodel.h + gui/models/colormodel.cpp + gui/models/colormodel.h gui/widgets/colorpage.cpp gui/widgets/colorpage.h gui/widgets/container.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b7f6e8bc4..b06506604 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -220,8 +220,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/tabs/chattab.h \ gui/widgets/checkbox.cpp \ gui/widgets/checkbox.h \ - gui/widgets/colormodel.cpp \ - gui/widgets/colormodel.h \ + gui/models/colormodel.cpp \ + gui/models/colormodel.h \ gui/widgets/colorpage.cpp \ gui/widgets/colorpage.h \ gui/widgets/container.cpp \ diff --git a/src/gui/widgets/colormodel.cpp b/src/gui/models/colormodel.cpp index 3a71a93cc..47486d735 100644 --- a/src/gui/widgets/colormodel.cpp +++ b/src/gui/models/colormodel.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/colormodel.h" +#include "gui/models/colormodel.h" #include "gui/widgets/widget2.h" diff --git a/src/gui/widgets/colormodel.h b/src/gui/models/colormodel.h index ba68e94e2..f3d6f3617 100644 --- a/src/gui/widgets/colormodel.h +++ b/src/gui/models/colormodel.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_COLORMODEL_H -#define GUI_WIDGETS_COLORMODEL_H +#ifndef GUI_MODELS_COLORMODEL_H +#define GUI_MODELS_COLORMODEL_H #include "utils/stringvector.h" @@ -73,4 +73,4 @@ class ColorModel : public ListModel std::vector<ColorPair> mColors; }; -#endif // GUI_WIDGETS_COLORMODEL_H +#endif // GUI_MODELS_COLORMODEL_H diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index 8196dead4..5e10b885c 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -20,7 +20,7 @@ #include "gui/widgets/colorpage.h" -#include "gui/widgets/colormodel.h" +#include "gui/models/colormodel.h" #include "gui/font.h" diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index d94344090..97ce9b5c7 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -20,7 +20,8 @@ #include "gui/windows/emotewindow.h" -#include "gui/widgets/colormodel.h" +#include "gui/models/colormodel.h" + #include "gui/widgets/colorpage.h" #include "gui/widgets/emotepage.h" #include "gui/widgets/namesmodel.h" |