From ecf7b40d77ea26777a2bd83d9024a217168f215c Mon Sep 17 00:00:00 2001
From: Bo Thorsen <bo@sonofthor.dk>
Date: Wed, 25 Feb 2004 15:10:56 +0000
Subject: [PATCH] Cleanup job: the protocol() method is now removed. It was by
 now only used in a single debug statement in kmcommands.cpp

svn path=/trunk/kdepim/; revision=291315
---
 folderstorage.h      | 2 --
 kmcommands.cpp       | 2 +-
 kmfolder.cpp         | 5 -----
 kmfolder.h           | 2 --
 kmfoldercachedimap.h | 2 --
 kmfolderimap.h       | 1 -
 kmfoldermaildir.h    | 2 --
 kmfoldermbox.h       | 2 --
 kmfoldersearch.h     | 1 -
 9 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/folderstorage.h b/folderstorage.h
index aef118e6c..d0bd32db8 100644
--- a/folderstorage.h
+++ b/folderstorage.h
@@ -305,8 +305,6 @@ public:
   /** Type of the folder. Inherited. */
   virtual const char* type() const;
 
-  virtual QCString protocol() const = 0;
-
   /** Returns TRUE if accounts are associated with this folder. */
   bool hasAccounts() const { return (mAcctList != 0); }
 
diff --git a/kmcommands.cpp b/kmcommands.cpp
index 7ec05ef29..e847e6dde 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -222,7 +222,7 @@ void KMCommand::transferSelectedMsgs()
     if ( thisMsg->parent() && !thisMsg->isComplete() &&
          ( !mProgressDialog || !mProgressDialog->wasCancelled() ) )
     {
-      kdDebug(5006)<<"### INCOMPLETE with protocol = "<<thisMsg->parent()->protocol() <<endl;
+      kdDebug(5006)<<"### INCOMPLETE\n";
       // the message needs to be transferred first
       complete = false;
       KMCommand::mCountJobs++;
diff --git a/kmfolder.cpp b/kmfolder.cpp
index 792a35f98..1cf57c05a 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -457,11 +457,6 @@ const char* KMFolder::type() const
   return mStorage->type();
 }
 
-QCString KMFolder::protocol() const
-{
-  return mStorage->protocol();
-}
-
 bool KMFolder::hasAccounts() const
 {
   return mStorage->hasAccounts();
diff --git a/kmfolder.h b/kmfolder.h
index ff9838261..1da6ab0b9 100644
--- a/kmfolder.h
+++ b/kmfolder.h
@@ -305,8 +305,6 @@ public:
   /** Type of the folder. Inherited. */
   const char* type() const;
 
-  QCString protocol() const;
-
   /** Returns TRUE if accounts are associated with this folder. */
   bool hasAccounts() const;
 
diff --git a/kmfoldercachedimap.h b/kmfoldercachedimap.h
index 9d79a4c92..e50b89295 100644
--- a/kmfoldercachedimap.h
+++ b/kmfoldercachedimap.h
@@ -105,8 +105,6 @@ public:
   virtual imapState getSubfolderState() { return mSubfolderState; }
   virtual void setSubfolderState(imapState state) { mSubfolderState = state; }
 
-  virtual QCString protocol() const { return "cachedimap"; }
-
   /** The path to the imap folder on the server */
   void setImapPath(const QString &path) { mImapPath = path; }
   QString imapPath() { return mImapPath; }
diff --git a/kmfolderimap.h b/kmfolderimap.h
index bbacda96d..c41faadcc 100644
--- a/kmfolderimap.h
+++ b/kmfolderimap.h
@@ -93,7 +93,6 @@ public:
   /** Returns the type of this folder */
   virtual KMFolderType folderType() const { return KMFolderTypeImap; }
 
-  virtual QCString protocol() const { return "imap"; }
   virtual KMMessage* getMsg(int idx);
   /** The path to the imap folder on the server */
   void setImapPath(const QString &path) { mImapPath = path; }
diff --git a/kmfoldermaildir.h b/kmfoldermaildir.h
index 76bb3b49c..b4ee66ce2 100644
--- a/kmfoldermaildir.h
+++ b/kmfoldermaildir.h
@@ -85,8 +85,6 @@ public:
   /** Is the folder read-only? */
   virtual bool isReadOnly() const { return false; }
 
-  virtual QCString protocol() const { return "maildir"; }
-
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
                                   QString partSpecifier, const AttachmentStrategy *as ) const;
diff --git a/kmfoldermbox.h b/kmfoldermbox.h
index 3c596ed0b..34ccb88b2 100644
--- a/kmfoldermbox.h
+++ b/kmfoldermbox.h
@@ -94,8 +94,6 @@ public:
 
   void setProcmailLockFileName( const QString& );
 
-  virtual QCString protocol() const { return "mbox"; }
-
   static QCString escapeFrom( const QCString & str );
 
 protected:
diff --git a/kmfoldersearch.h b/kmfoldersearch.h
index b8010e17c..bed4eb653 100644
--- a/kmfoldersearch.h
+++ b/kmfoldersearch.h
@@ -151,7 +151,6 @@ public:
   virtual int create(bool imap = FALSE);
   virtual int compact();
   virtual bool isReadOnly() const;
-  virtual QCString protocol() const { return "search"; }
   virtual const KMMsgBase* getMsgBase(int idx) const;
   virtual KMMsgBase* getMsgBase(int idx);
   virtual int find(const KMMsgBase* msg) const;