[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepimlibs] akonadi/src: Move the QuotaColorProxyModel to the correct location
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-10-05 14:27:31
Message-ID: E1Zj6jj-0003fe-0p () scm ! kde ! org
[Download RAW message or body]

Git commit 49d265c2b72701f7fe28c7ed45d75a69984c9fbc by Dan Vr=C3=A1til.
Committed on 05/10/2015 at 14:27.
Pushed by dvratil into branch 'master'.

Move the QuotaColorProxyModel to the correct location

All models are in core/models, having some in widgets unless there's a real=
 reason
(dependency-wise) would just be confusing.

M  +2    -0    akonadi/src/core/CMakeLists.txt
R  +0    -0    akonadi/src/core/models/quotacolorproxymodel.cpp [from: akon=
adi/src/widgets/quotacolorproxymodel.cpp - 100% similarity]
R  +1    -1    akonadi/src/core/models/quotacolorproxymodel.h [from: akonad=
i/src/widgets/quotacolorproxymodel.h - 096% similarity]
M  +0    -2    akonadi/src/widgets/CMakeLists.txt

http://commits.kde.org/kdepimlibs/49d265c2b72701f7fe28c7ed45d75a69984c9fbc

diff --git a/akonadi/src/core/CMakeLists.txt b/akonadi/src/core/CMakeLists.=
txt
index 4eaa22d..626ff83 100644
--- a/akonadi/src/core/CMakeLists.txt
+++ b/akonadi/src/core/CMakeLists.txt
@@ -134,6 +134,7 @@ set(akonadicore_models_SRCS
     models/entitytreemodel_p.cpp
     models/favoritecollectionsmodel.cpp
     models/itemmodel.cpp
+    models/quotacolorproxymodel.cpp
     models/recursivecollectionfilterproxymodel.cpp
     models/selectionproxymodel.cpp
     models/statisticsproxymodel.cpp
@@ -155,6 +156,7 @@ ecm_generate_headers(AkonadiCore_models_HEADERS
     EntityTreeModel
     FavoriteCollectionsModel
     ItemModel
+    QuotaColorProxyModel
     RecursiveCollectionFilterProxyModel
     SelectionProxyModel
     StatisticsProxyModel
diff --git a/akonadi/src/widgets/quotacolorproxymodel.cpp b/akonadi/src/cor=
e/models/quotacolorproxymodel.cpp
similarity index 100%
rename from akonadi/src/widgets/quotacolorproxymodel.cpp
rename to akonadi/src/core/models/quotacolorproxymodel.cpp
diff --git a/akonadi/src/widgets/quotacolorproxymodel.h b/akonadi/src/core/=
models/quotacolorproxymodel.h
similarity index 96%
rename from akonadi/src/widgets/quotacolorproxymodel.h
rename to akonadi/src/core/models/quotacolorproxymodel.h
index 80e4a80..c5ae5d4 100644
--- a/akonadi/src/widgets/quotacolorproxymodel.h
+++ b/akonadi/src/core/models/quotacolorproxymodel.h
@@ -46,7 +46,7 @@ namespace Akonadi
  * @author Kevin Ottens <ervin@kde.org>
  * @since 4.4
  */
-class AKONADIWIDGETS_EXPORT QuotaColorProxyModel : public QIdentityProxyMo=
del
+class AKONADICORE_EXPORT QuotaColorProxyModel : public QIdentityProxyModel
 {
     Q_OBJECT
 =

diff --git a/akonadi/src/widgets/CMakeLists.txt b/akonadi/src/widgets/CMake=
Lists.txt
index 3e7af97..8a5bf28 100644
--- a/akonadi/src/widgets/CMakeLists.txt
+++ b/akonadi/src/widgets/CMakeLists.txt
@@ -23,7 +23,6 @@ set(akonadiwidgets_SRCS
     itemview.cpp
     manageaccountwidget.cpp
     progressspinnerdelegate.cpp
-    quotacolorproxymodel.cpp
     recentcollectionaction.cpp
     renamefavoritedialog.cpp
     standardactionmanager.cpp
@@ -66,7 +65,6 @@ ecm_generate_headers(AkonadiWidgets_HEADERS
     ETMViewStateSaver
     ItemView
     ManageAccountWidget
-    QuotaColorProxyModel
     RenameFavoriteDialog
     StandardActionManager
     SubscriptionDialog
[prev in list] [next in list] [prev in thread] [next in thread]