Die, kmfoldertype. And stay down.

svn path=/branches/work/akonadi-ports/kdepim/; revision=1066800

collectiongeneralpage.cpp

@@ -347,7 +347,7 @@ void CollectionGeneralPage::init(const Akonadi::Collection &col)
     mIncidencesForComboBox = 0;
   }
 
-  if ( KMKernel::self()->folderType( col ) == KMFolderTypeImap ) {
+  if ( KMKernel::self()->isImapFolder( col ) ) {
     mSharedSeenFlagsCheckBox = new QCheckBox( this );
     mSharedSeenFlagsCheckBox->setText( i18n( "Share unread state with all users" ) );
     mSharedSeenFlagsCheckBox->setChecked( sharedSeen );

collectionmaintenancepage.cpp

@@ -19,6 +19,8 @@
 #include "collectionmaintenancepage.h"
 #include <akonadi/collectionstatistics.h>
 #include <akonadi/collection.h>
+#include <Akonadi/AgentType>
+#include <Akonadi/AgentManager>
 #include <klineedit.h>
 #include <QLabel>
 #include <QHBoxLayout>
@@ -27,25 +29,11 @@
 #include <KLocale>
 #include <QFormLayout>
 #include <kio/global.h>
-#include "kmfoldertype.h"
 #include "kmkernel.h"
 
 using namespace Akonadi;
 
 
-static QString folderTypeDesc( KMFolderType type )
-{
-  switch ( type )
-  {
-  case KMFolderTypeMbox:       return ( i18nc( "type of folder storage", "Mailbox" ) );
-  case KMFolderTypeMaildir:    return ( i18nc( "type of folder storage", "Maildir" ) );
-  case KMFolderTypeCachedImap: return ( i18nc( "type of folder storage", "Disconnected IMAP" ) );
-  case KMFolderTypeImap:       return ( i18nc( "type of folder storage", "IMAP" ) );
-  case KMFolderTypeSearch:     return ( i18nc( "type of folder storage", "Search" ) );
-  default:                     return ( i18nc( "type of folder storage", "Unknown" ) );
-  }
-}
-
 CollectionMaintenancePage::CollectionMaintenancePage(QWidget * parent) :
     CollectionPropertiesPage( parent )
 {
@@ -71,8 +59,8 @@ void CollectionMaintenancePage::init(const Akonadi::Collection & col)
   // get a buddy set (except in the cases where we do want one).
   box->addRow( new QLabel( i18nc( "@label:textbox Folder content type (eg. Mail)", "Contents:" ),
                            filesGroup ), label );
-  KMFolderType folderType = KMKernel::self()->folderType(col);
-  QString folderDesc = folderTypeDesc( folderType );
+  const AgentInstance instance = Akonadi::AgentManager::self()->instance( col.resource() );
+  const QString folderDesc = instance.type().name();
 
   label = new QLabel( folderDesc, filesGroup );
   box->addRow( new QLabel( i18n("Folder type:"), filesGroup ), label );

kmfoldertype.h

@@ -1,14 +0,0 @@
-#ifndef KMFOLDERTYPE_H
-#define KMFOLDERTYPE_H
-
-typedef enum
-{
-  KMFolderTypeMbox = 0,
-  KMFolderTypeMaildir,
-  KMFolderTypeCachedImap,
-  KMFolderTypeImap,
-  KMFolderTypeSearch,
-  KMFolderTypeUnknown
-} KMFolderType;
-
-#endif // KMFOLDERTYPE_H

kmkernel.cpp

@@ -2296,25 +2296,4 @@ bool KMKernel::isImapFolder( const Akonadi::Collection &col )
   return agentInstance.type().identifier() == IMAP_RESOURCE_IDENTIFIER;
 }
 
-
-KMFolderType KMKernel::folderType( const Akonadi::Collection &col )
-{
-  if ( Akonadi::CollectionUtils::isVirtual( col ) )
-    return KMFolderTypeSearch;
-
-  Akonadi::AgentInstance agentInstance = agentManager()->instance( col.resource() );
-
-  QString agentType = agentInstance.type().identifier();
-  if ( agentType == IMAP_RESOURCE_IDENTIFIER )
-    return KMFolderTypeImap;
-  if ( agentType == "akonadi_mbox_resource" )
-    return KMFolderTypeMbox;
-  if ( agentType == "akonadi_maildir_resource" )
-    return KMFolderTypeMaildir;
-  // Cached imap?
-
-  return KMFolderTypeUnknown;
-
-}
-
 #include "kmkernel.moc"

kmkernel.h

@@ -14,7 +14,6 @@
 #include <kconfig.h>
 #include <kurl.h>
 
-#include "kmfoldertype.h"
 #include "kmail_export.h"
 #include "kmmessagetag.h"
 #include "globalsettings.h"
@@ -294,8 +293,6 @@ public:
   bool folderIsTemplates(const Akonadi::Collection &);
   bool folderIsTrash( const Akonadi::Collection & );
 
-  KMFolderType folderType( const Akonadi::Collection &col );
-
   Akonadi::Collection trashCollectionFromResource( const Akonadi::Collection & col );
 
   /**