[Kde-pim] KDE

[Stephen Kelly]

SVN commit 1030481 by skelly:

Move EntityTreeView and FavoriteCollectionsView into kdepimlibs

I have patches to port playground/pim and mailody to use them from installed
locations.

If I've forgotten anyhing, simply change the includes to use <akonadi/entitytreeview.h>
instead of "akonadi_next/entitytreeview.h"


CCMAIL: kde-pim at kde.org



 M  +0 -3      kdepim/akonadi/akonadi_next/CMakeLists.txt  
 D             kdepim/akonadi/akonadi_next/dragdropmanager.cpp  
 D             kdepim/akonadi/akonadi_next/dragdropmanager_p.h  
 D             kdepim/akonadi/akonadi_next/entitytreeview.cpp  
 D             kdepim/akonadi/akonadi_next/entitytreeview.h  
 D             kdepim/akonadi/akonadi_next/favoritecollectionsview.cpp  
 D             kdepim/akonadi/akonadi_next/favoritecollectionsview.h  
 M  +8 -4      kdepim/akonadi/akonadiconsole/browserwidget.cpp  
 M  +1 -1      kdepim/akonadi/akonadiconsole/browserwidget_itemview.ui  
 M  +1 -1      kdepim/kaddressbook/mainwidget.cpp  
 M  +1 -1      kdepim/kpilot/conduits/akonadibase/akonadisetupwidget.cc  
 M  +5 -0      kdepimlibs/akonadi/CMakeLists.txt  
 AM            kdepimlibs/akonadi/dragdropmanager.cpp   kdepim/akonadi/akonadi_next/dragdropmanager.cpp#1030444 [License: LGPL (v2+)]
 AM            kdepimlibs/akonadi/dragdropmanager_p.h   kdepim/akonadi/akonadi_next/dragdropmanager_p.h#1030444 [License: LGPL (v2+)]
 AM            kdepimlibs/akonadi/entitytreeview.cpp   kdepim/akonadi/akonadi_next/entitytreeview.cpp#1030444 [License: LGPL (v2+)]
 AM            kdepimlibs/akonadi/entitytreeview.h   kdepim/akonadi/akonadi_next/entitytreeview.h#1030444 [License: LGPL (v2+)]
 AM            kdepimlibs/akonadi/favoritecollectionsview.cpp   kdepim/akonadi/akonadi_next/favoritecollectionsview.cpp#1030444 [License: LGPL (v2+)]
 AM            kdepimlibs/akonadi/favoritecollectionsview.h   kdepim/akonadi/akonadi_next/favoritecollectionsview.h#1030444 [License: LGPL (v2+)]


--- trunk/KDE/kdepim/akonadi/akonadi_next/CMakeLists.txt #1030480:1030481
@@ -19,8 +19,6 @@
 
 set( akonadi_next_SRCS
 #   qsortfilterproxymodel.cpp
-  entitytreeview.cpp
-  favoritecollectionsview.cpp
   collectionchildorderattribute.cpp
   modeltest.cpp
   # TODO Move this to akonadi-kabc
@@ -29,7 +27,6 @@
   mailmodel.cpp
   amazingcompleter.cpp
   amazingdelegate.cpp
-  dragdropmanager.cpp
 )
 
 kde4_add_library(akonadi_next SHARED ${akonadi_next_SRCS} )
--- trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp #1030480:1030481
@@ -38,12 +38,10 @@
 #include <akonadi/collectionpropertiesdialog.h>
 #include <akonadi/standardactionmanager.h>
 #include <akonadi/session.h>
-#include <xml/xmlwritejob.h>
-
-#include <akonadi_next/entitytreeview.h>
+#include <akonadi/entitytreeview.h>
 #include <akonadi/entitytreeviewstatesaver.h>
 #include <akonadi/favoritecollectionsmodel.h>
-#include <akonadi_next/favoritecollectionsview.h>
+#include <akonadi/favoritecollectionsview.h>
 #include <akonadi/statisticsproxymodel.h>
 #include <akonadi/statisticstooltipproxymodel.h>
 
@@ -58,6 +56,8 @@
 #include <kmessagebox.h>
 #include <kxmlguiwindow.h>
 
+#include <xml/xmlwritejob.h>
+
 #ifdef NEPOMUK_FOUND
 #include <nepomuk/resource.h>
 #include <nepomuk/resourcemanager.h>
@@ -72,6 +72,8 @@
 #include <QStandardItemModel>
 #include <QTimer>
 
+#include <akonadi_next/modeltest.h>
+
 using namespace Akonadi;
 
 AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY(CollectionAttributePageFactory, CollectionAttributePage)
@@ -122,6 +124,8 @@
   mBrowserModel->setItemPopulationStrategy( EntityTreeModel::LazyPopulation );
   mBrowserModel->setShowHiddenEntities(true);
 
+  new ModelTest( mBrowserModel );
+
   EntityFilterProxyModel *collectionFilter = new EntityFilterProxyModel( this );
   collectionFilter->setSourceModel( mBrowserModel );
   collectionFilter->addMimeTypeInclusionFilter( Collection::mimeType() );
--- trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget_itemview.ui #1030480:1030481
@@ -57,7 +57,7 @@
   <customwidget>
    <class>Akonadi::EntityTreeView</class>
    <extends>QTreeView</extends>
-   <header location="global">akonadi_next/entitytreeview.h</header>
+   <header location="global">akonadi/entitytreeview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
--- trunk/KDE/kdepim/kaddressbook/mainwidget.cpp #1030480:1030481
@@ -40,6 +40,7 @@
 #include <akonadi/contact/contactviewer.h>
 #include <akonadi/control.h>
 #include <akonadi/entityfilterproxymodel.h>
+#include <akonadi/entitytreeview.h>
 #include <akonadi/entitytreeviewstatesaver.h>
 #include <akonadi/itemview.h>
 #include <akonadi/mimetypechecker.h>
@@ -58,7 +59,6 @@
 #include <kxmlguiwindow.h>
 #include <libkdepim/uistatesaver.h>
 
-#include "akonadi_next/entitytreeview.h"
 #include "contactfiltermodel.h"
 #include "contactstreemodel.h"
 #include "contactswitcher.h"
--- trunk/KDE/kdepim/kpilot/conduits/akonadibase/akonadisetupwidget.cc #1030480:1030481
@@ -33,12 +33,12 @@
 #include <akonadi/control.h>
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/entitytreemodel.h>
+#include <akonadi/entitytreeview.h>
 #include <akonadi/collectionfilterproxymodel.h>
 #include <akonadi/entitytreeviewstatesaver.h>
 #include <akonadi/session.h>
 #include <akonadi/servermanager.h>
 
-#include <akonadi_next/entitytreeview.h>
 #include "options.h"
 
 using namespace Akonadi;
--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #1030480:1030481
@@ -75,17 +75,20 @@
   collectionstatisticsmodel.cpp
   collectionsync.cpp
   collectionview.cpp
+  dragdropmanager.cpp
   control.cpp
   entitycache.cpp
   entitydisplayattribute.cpp
   entityhiddenattribute.cpp
   entitytreemodel.cpp
   entitytreemodel_p.cpp
+  entitytreeview.cpp
   entityfilterproxymodel.cpp
   entitytreeviewstatesaver.cpp
   erroroverlay.cpp
   exception.cpp
   favoritecollectionsmodel.cpp
+  favoritecollectionsview.cpp
   firstrun.cpp
   flatcollectionproxymodel.cpp
   item.cpp
@@ -217,10 +220,12 @@
   entitydisplayattribute.h
   entityhiddenattribute.h
   entitytreemodel.h
+  entitytreeview.h
   entityfilterproxymodel.h
   entitytreeviewstatesaver.h
   exception.h
   favoritecollectionsmodel.h
+  favoritecollectionsview.h
   item.h
   itemcreatejob.h
   itemcopyjob.h
** trunk/KDE/kdepimlibs/akonadi/dragdropmanager.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdepimlibs/akonadi/dragdropmanager_p.h #property svn:mergeinfo
   + 
** trunk/KDE/kdepimlibs/akonadi/entitytreeview.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdepimlibs/akonadi/entitytreeview.h #property svn:mergeinfo
   + 
** trunk/KDE/kdepimlibs/akonadi/favoritecollectionsview.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdepimlibs/akonadi/favoritecollectionsview.h #property svn:mergeinfo
   + 
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/