Move new models to a sub dir

12 files changed, 14 insertions, 11 deletions

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 7f0e5ada3..e5fde597c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -49,7 +49,6 @@ set(client_SRCS
     ignorelisteditor.cpp
     lockwatcher.cpp
     logbrowser.cpp
-    models.cpp
     networksettings.cpp
     ocsjob.cpp
     ocssharejob.cpp
@@ -59,10 +58,8 @@ set(client_SRCS
     owncloudsetupwizard.cpp
     protocolwidget.cpp
     protocolitem.cpp
-    protocolitemmodel.cpp
     issueswidget.cpp
     activitydata.cpp
-    activitylistmodel.cpp
     activitywidget.cpp
     selectivesyncdialog.cpp
     settingsdialog.cpp
@@ -90,6 +87,11 @@ set(client_SRCS
     elidedlabel.cpp
     translations.cpp
     creds/httpcredentialsgui.cpp
+
+    models/activitylistmodel.cpp
+    models/models.cpp
+    models/protocolitemmodel.cpp
+
     wizard/postfixlineedit.cpp
     wizard/abstractcredswizardpage.cpp
     wizard/owncloudadvancedsetuppage.cpp
diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 02b65156f..695609a3b 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -15,7 +15,6 @@
 #include <QtGui>
 #include <QtWidgets>
 
-#include "activitylistmodel.h"
 #include "activitywidget.h"
 #include "configfile.h"
 #include "syncresult.h"
@@ -29,7 +28,6 @@
 #include "account.h"
 #include "accountstate.h"
 #include "accountmanager.h"
-#include "models.h"
 #include "protocolwidget.h"
 #include "issueswidget.h"
 #include "QProgressIndicator.h"
@@ -39,6 +37,9 @@
 #include "theme.h"
 #include "ocsjob.h"
 
+#include "models/activitylistmodel.h"
+#include "models/models.h"
+
 #include "ui_activitywidget.h"
 
 #include <climits>
diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp
index 0a281a1b8..17f3e22db 100644
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -24,7 +24,7 @@
 #include "folderman.h"
 #include "syncfileitem.h"
 #include "folder.h"
-#include "models.h"
+#include "models/models.h"
 #include "openfilemanager.h"
 #include "protocolwidget.h"
 #include "accountstate.h"
diff --git a/src/gui/issueswidget.h b/src/gui/issueswidget.h
index 394443c2a..3fa6153ed 100644
--- a/src/gui/issueswidget.h
+++ b/src/gui/issueswidget.h
@@ -20,7 +20,7 @@
 #include <QLocale>
 #include <QTimer>
 
-#include "protocolitemmodel.h"
+#include "models/protocolitemmodel.h"
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
 
diff --git a/src/gui/activitylistmodel.cpp b/src/gui/models/activitylistmodel.cpp
index b6371b41a..b6371b41a 100644
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/models/activitylistmodel.cpp
diff --git a/src/gui/activitylistmodel.h b/src/gui/models/activitylistmodel.h
index 8c5b2422f..8c5b2422f 100644
--- a/src/gui/activitylistmodel.h
+++ b/src/gui/models/activitylistmodel.h
diff --git a/src/gui/models.cpp b/src/gui/models/models.cpp
index 2c0c37c5a..2c0c37c5a 100644
--- a/src/gui/models.cpp
+++ b/src/gui/models/models.cpp
diff --git a/src/gui/models.h b/src/gui/models/models.h
index 8cca50725..8cca50725 100644
--- a/src/gui/models.h
+++ b/src/gui/models/models.h
diff --git a/src/gui/protocolitemmodel.cpp b/src/gui/models/protocolitemmodel.cpp
index 7dab9c9f6..7dab9c9f6 100644
--- a/src/gui/protocolitemmodel.cpp
+++ b/src/gui/models/protocolitemmodel.cpp
diff --git a/src/gui/protocolitemmodel.h b/src/gui/models/protocolitemmodel.h
index ee3f8b2f4..ee3f8b2f4 100644
--- a/src/gui/protocolitemmodel.h
+++ b/src/gui/models/protocolitemmodel.h
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 82dd11aac..9d429ed57 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -16,7 +16,6 @@
 #include <QtGui>
 #include <QtWidgets>
 
-#include "activitylistmodel.h"
 #include "protocolwidget.h"
 #include "configfile.h"
 #include "syncresult.h"
@@ -24,13 +23,14 @@
 #include "theme.h"
 #include "folderman.h"
 #include "folder.h"
-#include "models.h"
 #include "openfilemanager.h"
 #include "guiutility.h"
 #include "accountstate.h"
 #include "syncfileitem.h"
 
-#include "activitylistmodel.h"
+#include "models/models.h"
+#include "models/activitylistmodel.h"
+
 #include "ui_protocolwidget.h"
 
 namespace OCC {
diff --git a/src/gui/protocolwidget.h b/src/gui/protocolwidget.h
index da3de2c60..e6ec55973 100644
--- a/src/gui/protocolwidget.h
+++ b/src/gui/protocolwidget.h
@@ -21,7 +21,7 @@
 
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
-#include "protocolitemmodel.h"
+#include "models/protocolitemmodel.h"
 
 #include "protocolitem.h"
 #include "ui_protocolwidget.h"