summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 17:20:21 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 17:20:21 +0300
commit23e954851812b1121d6f3d98a6b7b396bca17dc9 (patch)
tree09df9fea793e4280e9225076844cd2cb1e06f0c4 /src
parent2f0c3a26431ed87be273b182b341d9c167f92eca (diff)
downloadmv-23e954851812b1121d6f3d98a6b7b396bca17dc9.tar.gz
mv-23e954851812b1121d6f3d98a6b7b396bca17dc9.tar.bz2
mv-23e954851812b1121d6f3d98a6b7b396bca17dc9.tar.xz
mv-23e954851812b1121d6f3d98a6b7b396bca17dc9.zip
Move skillmodel into gui/models directory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/models/skillmodel.cpp (renamed from src/gui/widgets/skillmodel.cpp)2
-rw-r--r--src/gui/models/skillmodel.h (renamed from src/gui/widgets/skillmodel.h)6
-rw-r--r--src/gui/widgets/skillinfo.cpp3
-rw-r--r--src/gui/windows/skilldialog.cpp3
6 files changed, 12 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42c1e5b85..0a9fafdec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,8 +214,8 @@ SET(SRCS
gui/widgets/skilldata.h
gui/widgets/skillinfo.cpp
gui/widgets/skillinfo.h
- gui/widgets/skillmodel.cpp
- gui/widgets/skillmodel.h
+ gui/models/skillmodel.cpp
+ gui/models/skillmodel.h
gui/widgets/slider.cpp
gui/widgets/slider.h
gui/widgets/sliderlist.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7051ae052..7caa67529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -312,8 +312,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/skilldata.h \
gui/widgets/skillinfo.cpp \
gui/widgets/skillinfo.h \
- gui/widgets/skillmodel.cpp \
- gui/widgets/skillmodel.h \
+ gui/models/skillmodel.cpp \
+ gui/models/skillmodel.h \
gui/widgets/slider.cpp \
gui/widgets/slider.h \
gui/widgets/sliderlist.cpp \
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/models/skillmodel.cpp
index 3244feec4..706bbdee2 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/models/skillmodel.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/skillmodel.h"
+#include "gui/models/skillmodel.h"
#include "gui/widgets/skilldata.h"
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/models/skillmodel.h
index 38e36c2f1..11746118e 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/models/skillmodel.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_SKILLMODEL_H
-#define GUI_WIDGETS_SKILLMODEL_H
+#ifndef GUI_MODELS_SKILLMODEL_H
+#define GUI_MODELS_SKILLMODEL_H
#include "gui/widgets/skillinfo.h"
#include "gui/models/listmodel.h"
@@ -52,4 +52,4 @@ class SkillModel final : public ListModel
SkillList mVisibleSkills;
};
-#endif // GUI_WIDGETS_SKILLMODEL_H
+#endif // GUI_MODELS_SKILLMODEL_H
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 46a3f425f..a009d623a 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -27,7 +27,8 @@
#include "gui/theme.h"
#include "gui/widgets/skilldata.h"
-#include "gui/widgets/skillmodel.h"
+
+#include "gui/models/skillmodel.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f5f233402..d39d7061b 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -34,6 +34,8 @@
#include "gui/popups/textpopup.h"
+#include "gui/models/skillmodel.h"
+
#include "gui/windows/setupwindow.h"
#include "gui/windows/shortcutwindow.h"
@@ -41,7 +43,6 @@
#include "gui/widgets/label.h"
#include "gui/widgets/listbox.h"
#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/skillmodel.h"
#include "gui/widgets/tabs/tab.h"
#include "gui/widgets/tabbedarea.h"