Merge ...

SVN commit 648600 by kloecker:

This if-statement is obsolete because it is always true. It was added 6 years ago because
KIO::del didn't have the data signal, but in the current code we use KIO::get for everything.

SVN commit 648597 by kloecker:

Change the type of stage from int to Stage, reflecting what that variable always holds.
Patch by Sam Bishop.

svn path=/branches/kdepim/enterprise/kdepim/; revision=668133

popaccount.cpp

@@ -285,7 +285,6 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize)
 //-----------------------------------------------------------------------------
 void PopAccount::connectJob() {
   KIO::Scheduler::assignJobToSlave(mSlave, job);
-  if (stage != Dele)
   connect(job, SIGNAL( data( KIO::Job*, const QByteArray &)),
          SLOT( slotData( KIO::Job*, const QByteArray &)));
   connect(job, SIGNAL( result( KIO::Job * ) ),

popaccount.h

@@ -160,7 +160,7 @@ protected:
   QDataStream *curMsgStrm;
 
   int curMsgLen;
-  int stage;
+  Stage stage;
   QTimer processMsgsTimer;
   int processingDelay;
   int numMsgs, numBytes, numBytesToRead, numBytesRead, numMsgBytesRead;