Remove remaining uses of QMailHeartbeatTimer.

Finishes NB#257648 Use QTimer instead of syshb
Fixes NB#265381 crash in QMailHeartbeatTimer
Fixes NB#267768 segfaults @ QtMobility::QSystemAlignedTimerPrivate::error

8 files changed, 18 insertions, 26 deletions

diff --git a/CHANGES b/CHANGES
index 41829977..b3f95413 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Latest Changes
 201125
   * Fixes: NB#215942 Traditional Chinese character is corrupted in mailbox
   * Fixes: NB#232541 Invitations not displayed in the message viewer for Gmail 
+  * Fixes: NB#265381 crash in QMailHeartbeatTimer::stop()
+  * Fixes: NB#267768 messageserver segfaults @ QtMobility::QSystemAlignedTimerPrivate::error
 
 201123
   * Fixes: NB#265223 Original message body shown empty in message view
diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp
index 92c8206a..7d30b73e 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.cpp
+++ b/src/libraries/qmfmessageserver/qmailtransport.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "qmailtransport.h"
-#include "qmailheartbeattimer.h"
 #include <QFile>
 #include <QTimer>
 
@@ -255,9 +254,8 @@ void QMailTransport::open(const QString& url, int port, EncryptType encryptionTy
     
     mInUse = true;
 
-    const int oneMin = 1 * 60 * 1000;
     const int threeMin = 3 * 60 * 1000;
-    connectToHostTimeOut.start(oneMin, threeMin); // even this seems way too long?
+    connectToHostTimeOut.start(threeMin); // even this seems way too long?
     createSocket(encryptionType);
     emit updateStatus(tr("DNS lookup"));
 
diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h
index a769f6ed..e8eb19ba 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.h
+++ b/src/libraries/qmfmessageserver/qmailtransport.h
@@ -43,10 +43,10 @@
 #define QMAILTRANSPORT_H
 
 #include <qmailglobal.h>
-#include "qmailheartbeattimer.h"
 
 #include <QObject>
 #include <QAbstractSocket>
+#include <QTimer>
 
 QT_BEGIN_NAMESPACE
 
@@ -145,7 +145,7 @@ private:
 #endif
     QDataStream *mStream;
     const char *mName;
-    QMailHeartbeatTimer connectToHostTimeOut;
+    QTimer connectToHostTimeOut;
     bool mConnected;
     bool mInUse;
 };
diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp
index 9450430a..70cd0b9b 100644
--- a/src/plugins/messageservices/imap/imapclient.cpp
+++ b/src/plugins/messageservices/imap/imapclient.cpp
@@ -49,7 +49,6 @@
 #include <qmailfolder.h>
 #include <qmailnamespace.h>
 #include <qmaildisconnected.h>
-#include <qmailheartbeattimer.h>
 #include <limits.h>
 #include <QFile>
 #include <QDir>
@@ -242,8 +241,8 @@ protected:
     QMailFolder _folder;
 
 private:
-    QMailHeartbeatTimer _idleTimer; // Send a DONE command every 29 minutes
-    QMailHeartbeatTimer _idleRecoveryTimer; // Check command hasn't hung
+    QTimer _idleTimer; // Send a DONE command every 29 minutes
+    QTimer _idleRecoveryTimer; // Check command hasn't hung
     int _idleRetryDelay; // Try to restablish IDLE state
     enum IdleRetryDelay { InitialIdleRetryDelay = 30 }; //seconds
 };
@@ -278,15 +277,14 @@ bool IdleProtocol::open(const ImapConfiguration& config)
 
 void IdleProtocol::idleContinuation(ImapCommand command, const QString &type)
 {
-    const int idleTimeOutMin = 25*60*1000;
-    const int idleTimeoutMax = 28*60*1000;
+    const int idleTimeout = 28*60*1000;
 
     if (command == IMAP_Idle) {
         if (type == QString("idling")) {
             qMailLog(IMAP) << "IDLE: Idle connection established.";
             
             // We are now idling
-            _idleTimer.start(idleTimeOutMin, idleTimeoutMax);
+            _idleTimer.start(idleTimeout);
             _idleRecoveryTimer.stop();
 
             handleIdling();
@@ -386,8 +384,7 @@ void IdleProtocol::idleTransportError()
 
     _idleRecoveryTimer.stop();
 
-    // 10 minute heartbeat window
-    QMailHeartbeatTimer::singleShot(qMax(1, _idleRetryDelay - 10*60)*1000, _idleRetryDelay*1000, this, SLOT(idleErrorRecovery()));
+    QTimer::singleShot(_idleRetryDelay*1000, this, SLOT(idleErrorRecovery()));
 }
 
 void IdleProtocol::idleErrorRecovery()
@@ -403,8 +400,7 @@ void IdleProtocol::idleErrorRecovery()
     }
     updateStatus(tr("Idle Error occurred"));
 
-    // 10 minute heartbeat window
-    QMailHeartbeatTimer::singleShot(qMax(1, _idleRetryDelay - 10*60)*1000, _idleRetryDelay*1000, this, SLOT(idleErrorRecovery()));
+    QTimer::singleShot(_idleRetryDelay*1000, this, SLOT(idleErrorRecovery()));
     _idleRetryDelay = qMin( oneHour, _idleRetryDelay*2 );
     
     emit openRequest(this);
diff --git a/src/plugins/messageservices/imap/imapclient.h b/src/plugins/messageservices/imap/imapclient.h
index 87b7e9c7..54300e83 100644
--- a/src/plugins/messageservices/imap/imapclient.h
+++ b/src/plugins/messageservices/imap/imapclient.h
@@ -43,7 +43,7 @@
 #define IMAPCLIENT_H
 
 #include "imapprotocol.h"
-#include "qmailheartbeattimer.h"
+#include "qtimer.h"
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qobject.h>
@@ -158,7 +158,7 @@ private:
     QMailAccountConfiguration _config;
 
     ImapProtocol _protocol;
-    QMailHeartbeatTimer _inactiveTimer;
+    QTimer _inactiveTimer;
     int _closeCount;
 
     bool _waitingForIdle;
diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
index 0f3f5c30..f8e51380 100644
--- a/src/plugins/messageservices/imap/imapservice.cpp
+++ b/src/plugins/messageservices/imap/imapservice.cpp
@@ -47,7 +47,6 @@
 #include "imapstrategy.h"
 #include <QtPlugin>
 #include <QTimer>
-#include <qmailheartbeattimer.h>
 #include <qmaillog.h>
 #include <qmailmessage.h>
 #include <qmaildisconnected.h>
@@ -106,8 +105,7 @@ public:
     {
         _intervalTimer.stop();
         if (interval > 0) {
-            // 1 minute heartbeat window
-            _intervalTimer.start(qMax(1, interval-1)*1000*60, interval*1000*60); // interval minutes
+            _intervalTimer.start(interval*1000*60); // interval minutes
         }
     }
 
@@ -172,7 +170,7 @@ private:
     QMailFolderId _mailCheckFolderId;
     bool _unavailable;
     bool _synchronizing;
-    QMailHeartbeatTimer _intervalTimer;
+    QTimer _intervalTimer;
     QList<QMailFolderId> _queuedFolders;
     quint64 _setMask;
     quint64 _unsetMask;
@@ -1225,7 +1223,7 @@ ImapService::ImapService(const QMailAccountId &accountId)
       _accountId(accountId),
       _client(0),
       _source(new Source(this)),
-      _restartPushEmailTimer(new QMailHeartbeatTimer(this)),
+      _restartPushEmailTimer(new QTimer(this)),
       _accountWasEnabled(false),
       _accountWasPushEnabled(false)
 {
@@ -1385,8 +1383,7 @@ bool ImapService::pushEmailEstablished()
     const int oneHour = 60*60;
     qMailLog(Messaging) << "Push email connection could not be established. Reattempting to establish in" << _pushRetry << "seconds";
 
-    // 1 minute heartbeat window
-    _restartPushEmailTimer->start(qMax(1, _pushRetry - 60)*1000, _pushRetry * 1000);
+    _restartPushEmailTimer->start(_pushRetry*1000);
     _pushRetry = qMin(oneHour, _pushRetry * 2);
     return false;
 }
diff --git a/src/plugins/messageservices/imap/imapservice.h b/src/plugins/messageservices/imap/imapservice.h
index 2afae6bf..3cf90761 100644
--- a/src/plugins/messageservices/imap/imapservice.h
+++ b/src/plugins/messageservices/imap/imapservice.h
@@ -86,7 +86,7 @@ private:
     QMailAccountId _accountId;
     ImapClient *_client;
     Source *_source;
-    QMailHeartbeatTimer *_restartPushEmailTimer;
+    QTimer *_restartPushEmailTimer;
     bool _establishingPushEmail;
     int _pushRetry;
     bool _accountWasEnabled;
diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index 5076d738..b1d79703 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -41,7 +41,6 @@
 
 
 #include "servicehandler.h"
-#include "qmailheartbeattimer.h"
 #include <longstream_p.h>
 #include <QDataStream>
 #include <QIODevice>