From kde-commits  Tue Dec 28 15:42:59 2010
From: Tobias Koenig <tokoe () kde ! org>
Date: Tue, 28 Dec 2010 15:42:59 +0000
To: kde-commits
Subject: KDE/kdepimlibs/akonadi
Message-Id: <20101228154259.E4E7AAC8AD () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129355103410163

SVN commit 1209934 by tokoe:

Pass a list of mime type filters to the SubscriptionDialog


 M  +1 -1      kmime/standardmailactionmanager.cpp  
 M  +8 -8      subscriptiondialog.cpp  
 M  +3 -3      subscriptiondialog_p.h  


--- trunk/KDE/kdepimlibs/akonadi/kmime/standardmailactionmanager.cpp #1209933:1209934
@@ -488,7 +488,7 @@
     void slotMailLocalSubscription()
     {
 #ifndef Q_OS_WINCE
-      SubscriptionDialog* dlg = new SubscriptionDialog( KMime::Message::mimeType(), mParentWidget );
+      SubscriptionDialog* dlg = new SubscriptionDialog( QStringList() << KMime::Message::mimeType(), mParentWidget );
       dlg->show();
 #endif
     }
--- trunk/KDE/kdepimlibs/akonadi/subscriptiondialog.cpp #1209933:1209934
@@ -105,17 +105,17 @@
     KDialog( parent ),
     d( new Private( this ) )
 {
-  init();
+  init( QStringList() );
 }
 
-SubscriptionDialog::SubscriptionDialog(const QString& mimetype, QWidget * parent) :
+SubscriptionDialog::SubscriptionDialog(const QStringList& mimetypes, QWidget * parent) :
     KDialog( parent ),
     d( new Private( this ) )
 {
-  init( mimetype );
+  init( mimetypes );
 }
 
-void SubscriptionDialog::init( const QString& mimetype )
+void SubscriptionDialog::init( const QStringList &mimetypes )
 {
   enableButtonOk( false );
   setCaption( i18n( "Local Subscriptions" ) );
@@ -134,8 +134,8 @@
 
   RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter
       = new Akonadi::RecursiveCollectionFilterProxyModel( this );
-  if ( !mimetype.isEmpty() )
-    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilter( mimetype );
+  if ( !mimetypes.isEmpty() )
+    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilters( mimetypes );
 
   filterRecursiveCollectionFilter->setSourceModel( filterTreeViewModel );
 
@@ -157,8 +157,8 @@
 
   RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter
       = new Akonadi::RecursiveCollectionFilterProxyModel( this );
-  if ( !mimetype.isEmpty() )
-    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilter( mimetype );
+  if ( !mimetypes.isEmpty() )
+    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilters( mimetypes );
 
   filterRecursiveCollectionFilter->setSourceModel( d->model );
 
--- trunk/KDE/kdepimlibs/akonadi/subscriptiondialog_p.h #1209933:1209934
@@ -46,10 +46,10 @@
      * Creates a new subscription dialog.
      *
      * @param parent The parent widget.
-     * @param mimetype The specific mimetype
+     * @param mimetypes The specific mimetypes
      * @since 4.6
      */
-    explicit SubscriptionDialog( const QString & mimetype, QWidget *parent = 0 );
+    explicit SubscriptionDialog( const QStringList &mimetypes, QWidget *parent = 0 );
 
     /**
      * Destroys the subscription dialog.
@@ -64,7 +64,7 @@
     class Private;
     Private* const d;
 
-    void init( const QString& mimetype = QString());
+    void init( const QStringList &mimetypes );
 
     Q_PRIVATE_SLOT( d, void done() )
     Q_PRIVATE_SLOT( d, void subscriptionResult( KJob* job ) )