summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 17:25:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 17:25:28 +0300
commit32bc15a1d1aee30f5a259b1648f8d82a5e837ff7 (patch)
treebfb410cae5135256fae99c49da4eeaec554f774a
parent23e954851812b1121d6f3d98a6b7b396bca17dc9 (diff)
downloadplus-32bc15a1d1aee30f5a259b1648f8d82a5e837ff7.tar.gz
plus-32bc15a1d1aee30f5a259b1648f8d82a5e837ff7.tar.bz2
plus-32bc15a1d1aee30f5a259b1648f8d82a5e837ff7.tar.xz
plus-32bc15a1d1aee30f5a259b1648f8d82a5e837ff7.zip
Move tablemodel into gui/models directory.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/models/tablemodel.cpp (renamed from src/gui/widgets/tablemodel.cpp)2
-rw-r--r--src/gui/models/tablemodel.h (renamed from src/gui/widgets/tablemodel.h)6
-rw-r--r--src/gui/widgets/guitable.h2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a9fafdec..b80e13a93 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -226,8 +226,8 @@ SET(SRCS
gui/widgets/tabbedarea.h
gui/widgets/guitable.cpp
gui/widgets/guitable.h
- gui/widgets/tablemodel.cpp
- gui/widgets/tablemodel.h
+ gui/models/tablemodel.cpp
+ gui/models/tablemodel.h
gui/widgets/tabstrip.cpp
gui/widgets/tabstrip.h
gui/widgets/textbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7caa67529..c57e4eb74 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -322,8 +322,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tabs/tab.h \
gui/widgets/tabbedarea.cpp \
gui/widgets/tabbedarea.h \
- gui/widgets/tablemodel.cpp \
- gui/widgets/tablemodel.h \
+ gui/models/tablemodel.cpp \
+ gui/models/tablemodel.h \
gui/widgets/tabstrip.cpp \
gui/widgets/tabstrip.h \
gui/widgets/textbox.cpp \
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/models/tablemodel.cpp
index 82b249d0f..aad66a6ad 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/models/tablemodel.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/tablemodel.h"
+#include "gui/models/tablemodel.h"
#include "utils/dtor.h"
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/models/tablemodel.h
index 48bd336af..ff752e6f1 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_TABLEMODEL_H
-#define GUI_WIDGETS_TABLEMODEL_H
+#ifndef GUI_MODELS_TABLEMODEL_H
+#define GUI_MODELS_TABLEMODEL_H
#include <set>
#include <vector>
@@ -161,4 +161,4 @@ protected:
std::vector<int> mWidths;
};
-#endif // GUI_WIDGETS_TABLEMODEL_H
+#endif // GUI_MODELS_TABLEMODEL_H
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 23185a903..8f5d0d300 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -25,7 +25,7 @@
#include "localconsts.h"
-#include "gui/widgets/tablemodel.h"
+#include "gui/models/tablemodel.h"
#include "listeners/keylistener.h"
#include "listeners/mouselistener.h"