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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2009-10-17 21:48:54
Message-ID: 1255816134.755925.18274.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1036834 by tokoe:

Deprecate CollectionFilterProxyModel in favor of EntityMimeTypeFilterModel
(the model formally known as MimeTypeFilterProxyModel)...


 M  +2 -2      CMakeLists.txt  
 M  +5 -0      akonadi_export.h  
 M  +8 -8      collectioncombobox.cpp  
 M  +5 -5      collectiondialog.cpp  
 M  +3 -1      collectionfilterproxymodel.h  
 M  +2 -2      contact/contactcompletionmodel.cpp  
 A             entitymimetypefiltermodel.cpp   mimetypefilterproxymodel.cpp#1036713 [License: LGPL (v2+)]
 A             entitymimetypefiltermodel.h   mimetypefilterproxymodel.h#1036713 [License: LGPL (v2+)]
 D             mimetypefilterproxymodel.cpp  
 D             mimetypefilterproxymodel.h  


--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #1036833:1036834
@@ -84,6 +84,7 @@
   entitydisplayattribute.cpp
   entityhiddenattribute.cpp
   entitylistview.cpp
+  entitymimetypefiltermodel.cpp
   entitytreemodel.cpp
   entitytreemodel_p.cpp
   entitytreeview.cpp
@@ -112,7 +113,6 @@
   linkjob.cpp
   filteractionjob.cpp
   mimetypechecker.cpp
-  mimetypefilterproxymodel.cpp
   monitor.cpp
   monitor_p.cpp
   partfetcher.cpp
@@ -225,6 +225,7 @@
   entitydisplayattribute.h
   entityhiddenattribute.h
   entitylistview.h
+  entitymimetypefiltermodel.h
   entitytreemodel.h
   entitytreeview.h
   entitytreeviewstatesaver.h
@@ -249,7 +250,6 @@
   linkjob.h
   filteractionjob.h
   mimetypechecker.h
-  mimetypefilterproxymodel.h
   monitor.h
   partfetcher.h
   preprocessorbase.h
--- trunk/KDE/kdepimlibs/akonadi/akonadi_export.h #1036833:1036834
@@ -31,6 +31,11 @@
    /* We are using this library */
 #  define AKONADI_EXPORT KDE_IMPORT
 # endif
+
+# ifndef AKONADI_EXPORT_DEPRECATED
+#  define AKONADI_EXPORT_DEPRECATED KDE_DEPRECATED AKONADI_EXPORT
+# endif
+
 #endif
 
 #endif
--- trunk/KDE/kdepimlibs/akonadi/collectioncombobox.cpp #1036833:1036834
@@ -26,8 +26,8 @@
 #include <akonadi/changerecorder.h>
 #include <akonadi/collectionfetchscope.h>
 #include <akonadi/collectionfilterproxymodel.h>
+#include <akonadi/entitymimetypefiltermodel.h>
 #include <akonadi/entitytreemodel.h>
-#include <akonadi/mimetypefilterproxymodel.h>
 #include <akonadi/session.h>
 
 #include <kdescendantsproxymodel.h>
@@ -60,8 +60,8 @@
         baseModel = proxyModel;
       }
 
-      mMimeTypeFilterProxyModel = new CollectionFilterProxyModel( parent );
-      mMimeTypeFilterProxyModel->setSourceModel( baseModel );
+      mEntityMimeTypeFilterModel = new EntityMimeTypeFilterModel( parent );
+      mEntityMimeTypeFilterModel->setSourceModel( baseModel );
 
 /*
       QStringList contentTypes;
@@ -82,9 +82,9 @@
       filterModel->setSourceModel( proxyModel );
 */
 
-      mParent->setModel( mMimeTypeFilterProxyModel );
+      mParent->setModel( mEntityMimeTypeFilterModel );
 
-      mSelectionHandler = new AsyncSelectionHandler( mMimeTypeFilterProxyModel, mParent );
+      mSelectionHandler = new AsyncSelectionHandler( mEntityMimeTypeFilterModel, mParent );
       mParent->connect( mSelectionHandler, SIGNAL( collectionAvailable( const QModelIndex& ) ),
                         mParent, SLOT( activated( const QModelIndex& ) ) );
 
@@ -106,7 +106,7 @@
 
     ChangeRecorder *mMonitor;
     EntityTreeModel *mModel;
-    CollectionFilterProxyModel *mMimeTypeFilterProxyModel;
+    EntityMimeTypeFilterModel *mEntityMimeTypeFilterModel;
     AsyncSelectionHandler *mSelectionHandler;
 
     QStringList mMimeTypesFilter;
@@ -143,8 +143,8 @@
 
 void CollectionComboBox::setContentMimeTypesFilter( const QStringList &contentMimeTypes )
 {
-  d->mMimeTypeFilterProxyModel->clearFilters();
-  d->mMimeTypeFilterProxyModel->addMimeTypeFilters( contentMimeTypes );
+  d->mEntityMimeTypeFilterModel->clearFilters();
+  d->mEntityMimeTypeFilterModel->addContentMimeTypeInclusionFilters( contentMimeTypes );
   d->mMimeTypesFilter = contentMimeTypes;
 
   if ( d->mMonitor ) {
--- trunk/KDE/kdepimlibs/akonadi/collectiondialog.cpp #1036833:1036834
@@ -19,9 +19,9 @@
 
 #include "collectiondialog.h"
 
-#include <akonadi/collectionfilterproxymodel.h>
 #include <akonadi/collectionmodel.h>
 #include <akonadi/collectionview.h>
+#include <akonadi/entitymimetypefiltermodel.h>
 
 #include <QtGui/QVBoxLayout>
 
@@ -32,7 +32,7 @@
   public:
     CollectionDialog *q;
     CollectionModel *collectionModel;
-    CollectionFilterProxyModel *filterModel;
+    EntityMimeTypeFilterModel *filterModel;
     CollectionView *collectionView;
 
     explicit Private(CollectionDialog *q);
@@ -61,7 +61,7 @@
 
   d->collectionModel = new CollectionModel( this );
 
-  d->filterModel = new CollectionFilterProxyModel( this );
+  d->filterModel = new EntityMimeTypeFilterModel( this );
   d->filterModel->setDynamicSortFilter( true );
   d->filterModel->setSortCaseSensitivity( Qt::CaseInsensitive );
   d->filterModel->setSourceModel( d->collectionModel );
@@ -109,12 +109,12 @@
 void CollectionDialog::setMimeTypeFilter( const QStringList &mimeTypes )
 {
   d->filterModel->clearFilters();
-  d->filterModel->addMimeTypeFilters( mimeTypes );
+  d->filterModel->addContentMimeTypeInclusionFilters( mimeTypes );
 }
 
 QStringList CollectionDialog::mimeTypeFilter() const
 {
-  return d->filterModel->mimeTypeFilters();
+  return d->filterModel->contentMimeTypeInclusionFilters();
 }
 
 void CollectionDialog::setSelectionMode( QAbstractItemView::SelectionMode mode )
--- trunk/KDE/kdepimlibs/akonadi/collectionfilterproxymodel.h #1036833:1036834
@@ -50,8 +50,10 @@
  * @endcode
  *
  * @author Bruno Virlet <bruno.virlet@gmail.com>
+ *
+ * @deprecated Use EntityMimeTypeFilterModel instead.
  */
-class AKONADI_EXPORT CollectionFilterProxyModel : public QSortFilterProxyModel
+class AKONADI_EXPORT_DEPRECATED CollectionFilterProxyModel : public QSortFilterProxyModel
 {
   Q_OBJECT
 
--- trunk/KDE/kdepimlibs/akonadi/contact/contactcompletionmodel.cpp #1036833:1036834
@@ -24,8 +24,8 @@
 #include <kdescendantsproxymodel.h>
 
 #include <akonadi/changerecorder.h>
+#include <akonadi/entitymimetypefiltermodel.h>
 #include <akonadi/itemfetchscope.h>
-#include <akonadi/mimetypefilterproxymodel.h>
 #include <akonadi/session.h>
 
 #include <kabc/addressee.h>
@@ -50,7 +50,7 @@
   KDescendantsProxyModel *descModel = new KDescendantsProxyModel( model );
   descModel->setSourceModel( model );
 
-  MimeTypeFilterProxyModel *filter = new Akonadi::MimeTypeFilterProxyModel( model );
+  EntityMimeTypeFilterModel *filter = new Akonadi::EntityMimeTypeFilterModel( model );
   filter->setSourceModel( descModel );
   filter->addMimeTypeExclusionFilter( Akonadi::Collection::mimeType() );
   filter->setHeaderGroup( Akonadi::EntityTreeModel::ItemListHeaders );
[prev in list] [next in list] [prev in thread] [next in thread]