summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 17:13:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 17:13:32 +0300
commit2f0c3a26431ed87be273b182b341d9c167f92eca (patch)
tree2c4206629a4a03ccad700f2ccd5b05b8fd3c9c9c
parentab5a67829ec6c80accfeb4f186a70886c82c8dba (diff)
downloadmv-2f0c3a26431ed87be273b182b341d9c167f92eca.tar.gz
mv-2f0c3a26431ed87be273b182b341d9c167f92eca.tar.bz2
mv-2f0c3a26431ed87be273b182b341d9c167f92eca.tar.xz
mv-2f0c3a26431ed87be273b182b341d9c167f92eca.zip
Move namesmodel into gui/models directory.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/models/namesmodel.cpp (renamed from src/gui/widgets/namesmodel.cpp)2
-rw-r--r--src/gui/models/namesmodel.h (renamed from src/gui/widgets/namesmodel.h)6
-rw-r--r--src/gui/widgets/setuptouchitem.h3
-rw-r--r--src/gui/widgets/tabs/setup_audio.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_joystick.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_perfomance.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_touch.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp3
-rw-r--r--src/gui/windows/emotewindow.cpp2
13 files changed, 24 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e13f9098..42c1e5b85 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -176,8 +176,8 @@ SET(SRCS
gui/widgets/linkhandler.h
gui/widgets/listbox.cpp
gui/widgets/listbox.h
- gui/widgets/namesmodel.cpp
- gui/widgets/namesmodel.h
+ gui/models/namesmodel.cpp
+ gui/models/namesmodel.h
gui/widgets/passwordfield.cpp
gui/widgets/passwordfield.h
gui/widgets/playerbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5622d0a42..7051ae052 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -274,8 +274,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/linkhandler.h \
gui/widgets/listbox.cpp \
gui/widgets/listbox.h \
- gui/widgets/namesmodel.cpp \
- gui/widgets/namesmodel.h \
+ gui/models/namesmodel.cpp \
+ gui/models/namesmodel.h \
gui/widgets/passwordfield.cpp \
gui/widgets/passwordfield.h \
gui/widgets/playerbox.cpp \
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/models/namesmodel.cpp
index 339f835d5..54a10c2cf 100644
--- a/src/gui/widgets/namesmodel.cpp
+++ b/src/gui/models/namesmodel.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/namesmodel.h"
+#include "gui/models/namesmodel.h"
#include "utils/gettext.h"
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/models/namesmodel.h
index 4018a3755..96d16de36 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_NAMESMODEL_H
-#define GUI_WIDGETS_NAMESMODEL_H
+#ifndef GUI_MODELS_NAMESMODEL_H
+#define GUI_MODELS_NAMESMODEL_H
#include "utils/stringvector.h"
@@ -58,4 +58,4 @@ class NamesModel : public ListModel
StringVect mNames;
};
-#endif // GUI_WIDGETS_NAMESMODEL_H
+#endif // GUI_MODELS_NAMESMODEL_H
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index f15c0d43d..b84b15f81 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -21,7 +21,8 @@
#ifndef GUI_WIDGETS_SETUPTOUCHITEM_H
#define GUI_WIDGETS_SETUPTOUCHITEM_H
-#include "gui/widgets/namesmodel.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/setupitem.h"
class TouchActionsModel final : public NamesModel
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index d70e4e1b4..e7c49723a 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -30,8 +30,9 @@
#include "gui/viewport.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index e2e66c6fc..ba5c37b5a 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -26,12 +26,13 @@
#include "input/joystick.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/button.h"
#include "gui/widgets/checkbox.h"
#include "gui/widgets/dropdown.h"
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 4640150e4..678dc2672 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -22,8 +22,9 @@
#include "gui/widgets/tabs/setup_other.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/setupitem.h"
#include "gui/widgets/scrollarea.h"
diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp
index 88cf6279c..cd92c8542 100644
--- a/src/gui/widgets/tabs/setup_perfomance.cpp
+++ b/src/gui/widgets/tabs/setup_perfomance.cpp
@@ -22,8 +22,9 @@
#include "gui/widgets/tabs/setup_perfomance.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/setupitem.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 8d5b234e1..99deda940 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -27,12 +27,12 @@
#include "gui/windows/okdialog.h"
#include "gui/models/extendedlistmodel.h"
+#include "gui/models/namesmodel.h"
#include "gui/widgets/button.h"
#include "gui/widgets/dropdown.h"
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "configuration.h"
diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index 1d9149fbd..e26716973 100644
--- a/src/gui/widgets/tabs/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -20,8 +20,9 @@
#include "gui/widgets/tabs/setup_touch.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/setuptouchitem.h"
#include "gui/widgets/scrollarea.h"
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index d7c2ff788..525d73d07 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -21,8 +21,9 @@
#include "gui/widgets/tabs/setup_visual.h"
+#include "gui/models/namesmodel.h"
+
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "client.h"
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 97ce9b5c7..3a7141533 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -21,10 +21,10 @@
#include "gui/windows/emotewindow.h"
#include "gui/models/colormodel.h"
+#include "gui/models/namesmodel.h"
#include "gui/widgets/colorpage.h"
#include "gui/widgets/emotepage.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/tabbedarea.h"