Fix removing of resource folders and rename isResourceImapFolder into

isResourceFolder and hideResourceImapFolder into hideResourceFolder, since
the resource is not imap specific at all. Port all callers.

svn path=/trunk/kdepim/; revision=346967

kmailicalifaceimpl.cpp

@@ -1124,16 +1124,21 @@ KMFolder* KMailICalIfaceImpl::folderFromType( const QString& type,
 
 // Returns true if folder is a resource folder. If the resource isn't enabled
 // this always returns false
-bool KMailICalIfaceImpl::isResourceImapFolder( KMFolder* folder ) const
+bool KMailICalIfaceImpl::isResourceFolder( KMFolder* folder ) const
 {
   return mUseResourceIMAP && folder &&
-    ( folder == mCalendar || folder == mTasks || folder == mJournals ||
-      folder == mNotes || folder == mContacts || mExtraFolders.find( folder->location() )!=0 );
+    ( isStandardResourceFolder( folder ) || mExtraFolders.find( folder->location() )!=0 );
 }
 
-bool KMailICalIfaceImpl::hideResourceImapFolder( KMFolder* folder ) const
+bool KMailICalIfaceImpl::isStandardResourceFolder( KMFolder* folder ) const
 {
-  return mHideFolders && isResourceImapFolder( folder );
+  return ( folder == mCalendar || folder == mTasks || folder == mJournals ||
+           folder == mNotes || folder == mContacts );
+}
+
+bool KMailICalIfaceImpl::hideResourceFolder( KMFolder* folder ) const
+{
+  return mHideFolders && isResourceFolder( folder );
 }
 
 KFolderTreeItem::Type KMailICalIfaceImpl::folderType( KMFolder* folder ) const
@@ -1265,7 +1270,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
   kdDebug(5006) << "folderContentsTypeChanged( " << folder->name()
                 << ", " << contentsType << ")\n";
 
-  if ( isResourceImapFolder( folder ) )
+  if ( isStandardResourceFolder( folder ) )
     return;
 
   // Check if already know that 'extra folder'

kmailicalifaceimpl.h

@@ -140,13 +140,17 @@ public:
    * Returns true if resource mode is enabled and folder is one of the
    * resource folders.
    */
-  bool isResourceImapFolder( KMFolder* folder ) const;
+  bool isResourceFolder( KMFolder* folder ) const;
+
+  /* Returns true if the folder is one of the standard resource folders, as
+   * opposed to an extra folder. */
+  bool isStandardResourceFolder( KMFolder* folder ) const;
 
   /**
-   * Returns true if isResourceImapFolder( folder ) returns true, and
+   * Returns true if isResourceFolder( folder ) returns true, and
    * imap folders should be hidden.
    */
-  bool hideResourceImapFolder( KMFolder* folder ) const;
+  bool hideResourceFolder( KMFolder* folder ) const;
 
   /**
    * Returns the resource folder type. Other is returned if resource

kmfolderdia.cpp

@@ -413,7 +413,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
   sl->addStretch( 1 );
 
   if ( kmkernel->iCalIface().isEnabled() &&
-       !kmkernel->iCalIface().isResourceImapFolder( mDlg->folder() ) ) {
+       !kmkernel->iCalIface().isResourceFolder( mDlg->folder() ) ) {
     // Only do make this settable, if the IMAP resource is enabled
     // and it's not the personal folders (those must not be changed)
     QGroupBox *typeGroup = new QGroupBox( i18n("Contents" ), this );

kmfoldertree.cpp

@@ -184,12 +184,12 @@ void KMFolderTreeItem::init()
       setType( SentMail );
     else if ( kmkernel->folderIsTrash( mFolder ) )
       setType( Trash );
-    else if( kmkernel->iCalIface().isResourceImapFolder(mFolder) )
+    else if( kmkernel->iCalIface().isResourceFolder(mFolder) )
       setType( kmkernel->iCalIface().folderType(mFolder) );
     // System folders on dimap or imap which are not resource folders are
     // inboxes. Urgs.
     if ( mFolder->isSystemFolder() &&
-        !kmkernel->iCalIface().isResourceImapFolder( mFolder) &&
+        !kmkernel->iCalIface().isResourceFolder( mFolder) &&
          ( mFolder->folderType() == KMFolderTypeImap
         || mFolder->folderType() == KMFolderTypeCachedImap ) )
       setType( Inbox );
@@ -604,7 +604,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
       fti->setExpandable( true );
     } else {
       // Check if this is an IMAP resource folder
-      if ( kmkernel->iCalIface().hideResourceImapFolder( folder ) )
+      if ( kmkernel->iCalIface().hideResourceFolder( folder ) )
         // It is
         continue;
 
@@ -1163,7 +1163,7 @@ void KMFolderTree::cleanupConfigFile()
     if (folderMap.find(name) == folderMap.end())
     {
       KMFolder* folder = kmkernel->findFolderById( name );
-      if ( folder && kmkernel->iCalIface().hideResourceImapFolder( folder ) )
+      if ( folder && kmkernel->iCalIface().hideResourceFolder( folder ) )
         continue; // hidden IMAP resource folder, don't delete info
 
       config->deleteGroup(*grpIt, TRUE);

kmreaderwin.cpp

@@ -1052,7 +1052,7 @@ void KMReaderWin::updateReaderWin()
   KMFolder* folder;
   if (message(&folder))
   {
-    if( !kmkernel->iCalIface().isResourceImapFolder( folder ) ){
+    if( !kmkernel->iCalIface().isResourceFolder( folder ) ){
       if ( mShowColorbar )
         mColorBar->show();
       else