popaccount done by akonadi

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

CMakeLists.txt

@@ -115,7 +115,6 @@ set(kmailprivate_LIB_SRCS
 #   imapaccountbase.cpp
    kmfawidgets.cpp
    undostack.cpp
-   #popaccount.cpp
    kmkernel.cpp
    searchwindow.cpp
    vacationdialog.cpp

accountwizard.cpp

@@ -29,7 +29,6 @@
 #include "accountwizard.h"
 
 #include "kmkernel.h"
-#include "popaccount.h"
 using KMail::AccountManager;
 
 #include "globalsettings.h"

kmkernel.cpp

@@ -1107,7 +1107,6 @@ void KMKernel::raise()
 
 bool KMKernel::showMail( quint32 serialNumber, const QString& /* messageId */ )
 {
-#if 0 //TODO port to akonadi
   KMMainWidget *mainWidget = 0;
 
   // First look for a KMainWindow.
@@ -1120,7 +1119,7 @@ bool KMKernel::showMail( quint32 serialNumber, const QString& /* messageId */ )
         break;
     }
   }
-
+#if 0
   if ( mainWidget ) {
     int idx = -1;
     KMFolder *folder = 0;

popaccount.h

@@ -1,252 +0,0 @@
-// -*- c++ -*-
-#ifndef POPACCOUNT_H
-#define POPACCOUNT_H
-
-#include "networkaccount.h"
-
-#include <QTimer>
-#include <QSet>
-#include <QQueue>
-
-class KMPopFilterCnfrmDlg;
-class KMPopHeaders;
-class KMMessage;
-
-class QDataStream;
-class QByteArray;
-class KJob;
-namespace KIO {
-  class MetaData;
-  class Slave;
-  class SimpleJob;
-  class Job;
-}
-
-/** The namespace where all classes of KMail can be found in. */
-namespace KMail {
-/**
- * KMail account for pop mail account
- */
-class PopAccount: public NetworkAccount {
-  Q_OBJECT
-
-public:
-  virtual ~PopAccount();
-  virtual void init(void);
-
-  virtual KIO::MetaData slaveConfig() const;
-
-  /**
-   * Reimplemented from KMAccount
-   */
-  virtual void cancelMailCheck();
-
-  /** A weak assignment operator */
-  virtual void pseudoAssign( const KMAccount * a );
-
-  virtual QString protocol() const;
-  virtual unsigned short int defaultPort() const;
-
-  /**
-   * Sending of several commands at once
-   */
-  bool usePipelining(void) const { return mUsePipelining; }
-  virtual void setUsePipelining(bool);
-
-  /**
-   * Shall messages be left on the server upon retreival (true)
-   * or deleted (false).
-   */
-  bool leaveOnServer(void) const { return mLeaveOnServer; }
-  virtual void setLeaveOnServer(bool);
-
-  /**
-   * If value is positive, leave mail on the server for so many days.
-   */
-  int leaveOnServerDays(void) const { return mLeaveOnServerDays; }
-  virtual void setLeaveOnServerDays(int);
-
-  /**
-   * If value is positive, leave so many messages on the server.
-   */
-  int leaveOnServerCount(void) const { return mLeaveOnServerCount; }
-  virtual void setLeaveOnServerCount(int);
-
-  /**
-   * If value is positive, leave so many MBs on the server.
-   */
-  int leaveOnServerSize(void) const { return mLeaveOnServerSize; }
-  virtual void setLeaveOnServerSize(int);
-
-  /**
-   * Shall messages be filter on the server (true)
-   * or not (false).
-   */
-  bool filterOnServer(void) const { return mFilterOnServer; }
-  virtual void setFilterOnServer(bool);
-
-  /**
-   * Size of messages which should be check on the
-   * pop server before download
-   */
-  unsigned int filterOnServerCheckSize(void) const { return mFilterOnServerCheckSize; }
-  virtual void setFilterOnServerCheckSize(unsigned int);
-
-  /**
-   * Inherited methods.
-   */
-  virtual void readConfig(KConfigGroup&);
-  virtual void writeConfig(KConfigGroup&);
-  virtual void processNewMail(bool _interactive);
-
-  virtual void killAllJobs( bool disconnectSlave=false ); // NOOP currently
-
-private:
-  enum Stage { Idle, List, Uidl, Head, Retr, Dele, Quit };
-  friend class ::AccountManager;
-  PopAccount(AccountManager* owner, const QString& accountName, uint id);
-
-  /**
-   * Start a KIO Job to get a list of messages on the pop server
-   */
-  void startJob();
-
-  /**
-   * Connect up the standard signals/slots for the KIO Jobs
-   */
-  void connectJob();
-
-  /**
-   * Process any queued messages
-   */
-  void processRemainingQueuedMessages();
-
-  /**
-   * Save the list of seen uids for this user/server
-   */
-  void saveUidList();
-
-  bool    mUsePipelining;
-  bool    mLeaveOnServer;
-  int     mLeaveOnServerDays;
-  int     mLeaveOnServerCount;
-  int     mLeaveOnServerSize;
-  bool    gotMsgs;
-  bool    mFilterOnServer;
-  unsigned int mFilterOnServerCheckSize;
-
-  KIO::SimpleJob *job;
-  // Map of ID's vs. sizes of messages which should be downloaded; use QMap because the order needs to be
-  // predictable
-  QMap<QByteArray, int> mMsgsPendingDownload;
-
-  KMPopFilterCnfrmDlg *mPopFilterConfirmationDialog;
-  QList<KMPopHeaders *> mHeadersOnServer;
-  int mHeaderIndex;
-  bool headers;
-
-  QSet<QByteArray> mHeaderDeleteUids;
-  QSet<QByteArray> mHeaderDownUids;
-  QSet<QByteArray> mHeaderLaterUids;
-
-  QList<QByteArray> idsOfMsgs; //used for ids and for count
-  QHash<QByteArray, QByteArray> mUidForIdMap; // maps message ID (i.e. index on the server) to UID
-  QHash<QByteArray, int> mUidsOfSeenMsgsDict; // set of UIDs of previously seen messages (for fast lookup)
-  QHash<QByteArray, int> mUidsOfNextSeenMsgsDict; // set of UIDs of seen messages (for the next check)
-  QVector<int> mTimeOfSeenMsgsVector; // list of times of previously seen messages
-  QHash<QByteArray, int> mTimeOfNextSeenMsgsMap; // map of uid to times of seen messages
-  QHash<QByteArray, int> mSizeOfNextSeenMsgsDict;
-  QSet<QByteArray> idsOfMsgsToDelete;
-
-  // All IDs that we'll delete in any case, even if we have "leave on server"
-  // checked. This is only used when the server issues an invalid UIDL response
-  // and we can't map a UID to the ID. See bug 127696.
-  QSet<QByteArray> idsOfForcedDeletes; 
-
-  int indexOfCurrentMsg;
-
-  QQueue<KMMessage*> msgsAwaitingProcessing;
-  QQueue<QByteArray> msgIdsAwaitingProcessing;
-  QQueue<QByteArray> msgUidsAwaitingProcessing;
-
-  QByteArray curMsgData;
-  QDataStream *curMsgStrm;
-
-  int curMsgLen;
-  Stage stage;
-  QTimer processMsgsTimer;
-  int processingDelay;
-  int numMsgs, numBytes, numBytesToRead, numBytesRead, numMsgBytesRead;
-  bool interactive;
-  bool mProcessing;
-  bool mUidlFinished;
-  int dataCounter;
-
-protected slots:
-  /**
-   * Messages are downloaded in the background and then once every x seconds
-   * a batch of messages are processed. Messages are processed in batches to
-   * reduce flicker (multiple refreshes of the qlistview of messages headers
-   * in a single second causes flicker) when using a fast pop server such as
-   * one on a lan.
-   *
-   * Processing a message means applying KMAccount::processNewMsg to it and
-   * adding its UID to the list of seen UIDs
-   */
-  void slotProcessPendingMsgs();
-
-  /**
-   * If there are more messages to be downloaded then start a new kio job
-   * to get the message whose id is at the head of the queue
-   */
-  void slotGetNextMsg();
-
-  /**
-   * A messages has been retrieved successfully. The next data belongs to the
-   * next message.
-   */
-  void slotMsgRetrieved(KJob*, const QString &, const QString &);
-
-  /**
-   * New data has arrived append it to the end of the current message
-   */
-  void slotData( KIO::Job*, const QByteArray &);
-
-  /**
-   * Finished downloading the current kio job, either due to an error
-   * or because the job has been canceled or because the complete message
-   * has been downloaded
-   */
-  void slotResult( KJob* );
-
-  /**
-   * Cleans up after a user cancels the current job
-   */
-  void slotCancel();
-
-  /**
-   * Kills the job if still stage == List
-   */
-  void slotAbortRequested();
-
-  /**
-   * Called when a job is finished. Basically a finite state machine for
-   * cycling through the Idle, List, Uidl, Retr, Quit stages
-   */
-  void slotJobFinished();
-
-  /**
-   * Slave error handling
-   */
-  void slotSlaveError(KIO::Slave *, int, const QString &);
-
-  /**
-   * If there are more headers to be downloaded then start a new kio job
-   * to get the next header
-   */
-  void slotGetNextHdr();
-};
-
-} // namespace KMail
-
-#endif // POPACCOUNT_H