Move database-specific code to items/database/

25 files changed, 38 insertions, 26 deletions

diff --git a/src/commands.cpp b/src/commands.cpp
index 7fcd005..13b3e42 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -19,8 +19,8 @@
 #include "diagramdocument.h"
 #include "diagramconnection.h"
 #include "diagramitem.h"
-#include "databasetable.h"
-#include "column.h"
+#include "items/database/databasetable.h"
+#include "items/database/column.h"
 
 SetObjectPropertyCommand::SetObjectPropertyCommand(QObject *object, const char *name, const QVariant &value, QUndoCommand *parent)
 	: QUndoCommand(parent), m_object(object), m_name(name), m_newValue(value)
diff --git a/src/commands.h b/src/commands.h
index 7b0739b..139389a 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -27,7 +27,7 @@ class DiagramConnection;
 class DiagramObject;
 class DiagramItem;
 class Column;
-#include "column.h"
+#include "items/database/column.h"
 
 enum {
 	COMMAND_SET_OBJECT_PROPERTY,
diff --git a/src/diagramdocument.cpp b/src/diagramdocument.cpp
index d1ae22e..02033da 100644
--- a/src/diagramdocument.cpp
+++ b/src/diagramdocument.cpp
@@ -17,9 +17,9 @@
 #include "diagramdocument.h"
 #include "diagramobject.h"
 #include "diagramconnection.h"
-#include "databasetable.h"
-#include "databaserelationship.h"
-#include "column.h"
+#include "items/database/databasetable.h"
+#include "items/database/databaserelationship.h"
+#include "items/database/column.h"
 #include "commands.h"
 #include <QGraphicsItem>
 #include <QDebug>
diff --git a/src/diagramitemregistry.cpp b/src/diagramitemregistry.cpp
index ebc4f10..d33df18 100644
--- a/src/diagramitemregistry.cpp
+++ b/src/diagramitemregistry.cpp
@@ -36,8 +36,8 @@ DiagramItemRegistry::createItem(const QString &typeName)
 // =========================================================================
 // =========================================================================
 
-#include "databasetable.h"
-#include "databaserelationship.h"
+#include "items/database/databasetable.h"
+#include "items/database/databaserelationship.h"
 
 DiagramItemRegistry::DiagramItemRegistry()
 {
diff --git a/src/items/base/base.pri b/src/items/base/base.pri
new file mode 100644
index 0000000..88086e5
--- /dev/null
+++ b/src/items/base/base.pri
@@ -0,0 +1 @@
+DEPENDPATH += $$PWD
diff --git a/src/column.cpp b/src/items/database/column.cpp
index e8a355b..e8a355b 100644
--- a/src/column.cpp
+++ b/src/items/database/column.cpp
diff --git a/src/column.h b/src/items/database/column.h
index 2930efa..2930efa 100644
--- a/src/column.h
+++ b/src/items/database/column.h
diff --git a/src/columnlist.cpp b/src/items/database/columnlist.cpp
index b1ed623..b1ed623 100644
--- a/src/columnlist.cpp
+++ b/src/items/database/columnlist.cpp
diff --git a/src/columnlist.h b/src/items/database/columnlist.h
index 51a25be..51a25be 100644
--- a/src/columnlist.h
+++ b/src/items/database/columnlist.h
diff --git a/src/columnlistmodel.cpp b/src/items/database/columnlistmodel.cpp
index 5a282c8..5a282c8 100644
--- a/src/columnlistmodel.cpp
+++ b/src/items/database/columnlistmodel.cpp
diff --git a/src/columnlistmodel.h b/src/items/database/columnlistmodel.h
index 2944223..2944223 100644
--- a/src/columnlistmodel.h
+++ b/src/items/database/columnlistmodel.h
diff --git a/src/columnlistview.cpp b/src/items/database/columnlistview.cpp
index dd73fb6..dd73fb6 100644
--- a/src/columnlistview.cpp
+++ b/src/items/database/columnlistview.cpp
diff --git a/src/columnlistview.h b/src/items/database/columnlistview.h
index 8e2bb47..8e2bb47 100644
--- a/src/columnlistview.h
+++ b/src/items/database/columnlistview.h
diff --git a/src/items/database/database.pri b/src/items/database/database.pri
new file mode 100644
index 0000000..f673ff6
--- /dev/null
+++ b/src/items/database/database.pri
@@ -0,0 +1,22 @@
+DEPENDPATH += $$PWD
+
+SOURCES += \
+	column.cpp \
+	columnlist.cpp \
+	columnlistmodel.cpp \
+	columnlistview.cpp \
+	databasetable.cpp \
+	databaserelationship.cpp \
+	tableproperties.cpp
+
+HEADERS += \
+	column.h \
+	columnlist.h \
+	columnlistmodel.h \
+	columnlistview.h \
+	databasetable.h \
+	databaserelationship.h \
+	tableproperties.h
+
+FORMS += \
+	tableproperties.ui
diff --git a/src/databaserelationship.cpp b/src/items/database/databaserelationship.cpp
index 02540c5..02540c5 100644
--- a/src/databaserelationship.cpp
+++ b/src/items/database/databaserelationship.cpp
diff --git a/src/databaserelationship.h b/src/items/database/databaserelationship.h
index e9e26d0..e9e26d0 100644
--- a/src/databaserelationship.h
+++ b/src/items/database/databaserelationship.h
diff --git a/src/databasetable.cpp b/src/items/database/databasetable.cpp
index 911457f..911457f 100644
--- a/src/databasetable.cpp
+++ b/src/items/database/databasetable.cpp
diff --git a/src/databasetable.h b/src/items/database/databasetable.h
index 8be1ee5..8be1ee5 100644
--- a/src/databasetable.h
+++ b/src/items/database/databasetable.h
diff --git a/src/tableproperties.cpp b/src/items/database/tableproperties.cpp
index 11b3fc4..11b3fc4 100644
--- a/src/tableproperties.cpp
+++ b/src/items/database/tableproperties.cpp
diff --git a/src/tableproperties.h b/src/items/database/tableproperties.h
index 6ad51a5..6ad51a5 100644
--- a/src/tableproperties.h
+++ b/src/items/database/tableproperties.h
diff --git a/src/tableproperties.ui b/src/items/database/tableproperties.ui
index 7336cee..0ad531a 100644
--- a/src/tableproperties.ui
+++ b/src/items/database/tableproperties.ui
@@ -129,7 +129,7 @@
   <customwidget>
    <class>ColumnListView</class>
    <extends>QTreeView</extends>
-   <header>columnlistview.h</header>
+   <header>items/database/columnlistview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/items/items.pri b/src/items/items.pri
new file mode 100644
index 0000000..a1029c1
--- /dev/null
+++ b/src/items/items.pri
@@ -0,0 +1,2 @@
+include(base/base.pri)
+include(database/database.pri)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 81d23e9..a145be1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -29,7 +29,7 @@
 #include <QMessageBox>
 #include <QDebug>
 #include "mainwindow.h"
-#include "databasetable.h"
+#include "items/database/databasetable.h"
 #include "commands.h"
 
 using namespace std;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index e09bc5a..3bc5263 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,7 +25,7 @@
 #include <QAction>
 #include "diagramview.h"
 #include "diagramdocument.h"
-#include "tableproperties.h"
+#include "items/database/tableproperties.h"
 
 class MainWindow: public QMainWindow
 {
diff --git a/src/src.pro b/src/src.pro
index bb398dd..edf06a1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,42 +3,29 @@ TARGET = dbmodel
 QT += xml svg
 CONFIG += debug
 SOURCES = \
-	column.cpp \
-	columnlist.cpp \
-	columnlistmodel.cpp \
-	columnlistview.cpp \
 	main.cpp \
 	mainwindow.cpp \
 	diagramview.cpp \
 	diagramdocument.cpp \
-	databasetable.cpp \
-	databaserelationship.cpp \
 	diagramconnection.cpp \
 	diagramitem.cpp \
 	diagramitemregistry.cpp \
 	diagramobject.cpp \
-	tableproperties.cpp \
 	commands.cpp
 HEADERS = \
-	column.h \
-	columnlist.h \
-	columnlistmodel.h \
-	columnlistview.h \
 	mainwindow.h \
 	diagramview.h \
 	diagramdocument.h \
-	databasetable.h \
-	databaserelationship.h \
 	diagramconnection.h \
 	diagramitem.h \
 	diagramitemregistry.h \
 	diagramobject.h \
-	tableproperties.h \
 	range.h \
 	commands.h
-FORMS = tableproperties.ui
 RESOURCES = ../dbmodel.qrc
 
+include(items/items.pri)
+
 DESTDIR = ../
 
 TRANSLATIONS = \