#1 Change timer from pointer to member.

parsley72 · Mar 5, 2014 · c7b07a2 · c7b07a2
1 parent c57ade3
commit c7b07a2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 34 deletions.
diff --git a/downloadmanagerFTP.cpp b/downloadmanagerFTP.cpp
@@ -19,7 +19,6 @@ DownloadManagerFTP::DownloadManagerFTP(QObject *parent) :
     , _bAcceptRanges(false)
     , _nDownloadSize(0)
     , _nDownloadSizeAtPause(0)
-    , _pTimer(NULL)
     , _pFTP(NULL)
 {
 }
@@ -82,12 +81,6 @@ void DownloadManagerFTP::download(QUrl url)
 
         _pCurrentReply = _pManager->head(_CurrentRequest);
 
-        _pTimer = new QTimer(this);
-        _pTimer->setInterval(5000);
-        _pTimer->setSingleShot(true);
-        connect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
-        _pTimer->start();
-
         connect(_pCurrentReply, SIGNAL(finished()), this, SLOT(finishedHead()));
         connect(_pCurrentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
     }
@@ -101,11 +94,10 @@ void DownloadManagerFTP::pause()
     {
         return;
     }
-    _pTimer->stop();
-    disconnect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
     disconnect(_pCurrentReply,SIGNAL(finished()),this,SLOT(finished()));
     disconnect(_pCurrentReply,SIGNAL(downloadProgress(qint64,qint64)),this,SLOT(downloadProgress(qint64,qint64)));
     disconnect(_pCurrentReply,SIGNAL(error(QNetworkReply::NetworkError)),this,SLOT(error(QNetworkReply::NetworkError)));
+    _Timer.stop();
 
     _pCurrentReply->abort();
 //    _pFile->write( _pCurrentReply->readAll());
@@ -140,10 +132,6 @@ void DownloadManagerFTP::download()
 
     _pCurrentReply = _pManager->get(_CurrentRequest);
 
-    _pTimer->setInterval(5000);
-    _pTimer->setSingleShot(true);
-    connect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
-    _pTimer->start();
 
     connect(_pCurrentReply, SIGNAL(finished()), this, SLOT(finished()));
     connect(_pCurrentReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64)));
@@ -191,7 +179,7 @@ void DownloadManagerFTP::finished()
 {
     qDebug() << __FUNCTION__;
 
-    _pTimer->stop();
+    _Timer.stop();
     _pFile->close();
     QFile::remove(_qsFileName);
     _pFile->rename(_qsFileName + ".part", _qsFileName);
@@ -203,7 +191,6 @@ void DownloadManagerFTP::finished()
 
 void DownloadManagerFTP::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
-    _pTimer->stop();
     _nDownloadSize = _nDownloadSizeAtPause + bytesReceived;
     qDebug() << "Download Progress: Received=" << _nDownloadSize <<": Total=" << _nDownloadSizeAtPause + bytesTotal;
 
@@ -212,7 +199,6 @@ void DownloadManagerFTP::downloadProgress(qint64 bytesReceived, qint64 bytesTota
     qDebug() << percentage;
     emit progress(percentage);
 
-    _pTimer->start(5000);
 }
 
 

diff --git a/downloadmanagerFTP.h b/downloadmanagerFTP.h
@@ -58,8 +58,8 @@ private slots:
     bool _bAcceptRanges;
     int _nDownloadSize;
     int _nDownloadSizeAtPause;
-    QTimer *_pTimer;
     QFtp *_pFTP;
+    QTimer _Timer;
 };
 
 #endif // QT_VERSION < 0x050000

diff --git a/downloadmanagerHTTP.cpp b/downloadmanagerHTTP.cpp
@@ -15,7 +15,6 @@ DownloadManagerHTTP::DownloadManagerHTTP(QObject *parent) :
     , _bAcceptRanges(false)
     , _nDownloadSize(0)
     , _nDownloadSizeAtPause(0)
-    , _pTimer(NULL)
 {
 }
 
@@ -37,11 +36,10 @@ void DownloadManagerHTTP::download(QUrl url)
 
     _pCurrentReply = _pManager->head(_CurrentRequest);
 
-    _pTimer = new QTimer(this);
-    _pTimer->setInterval(5000);
-    _pTimer->setSingleShot(true);
-    connect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
-    _pTimer->start();
+    _Timer.setInterval(5000);
+    _Timer.setSingleShot(true);
+    connect(&_Timer, SIGNAL(timeout()), this, SLOT(timeout()));
+    _Timer.start();
 
     connect(_pCurrentReply, SIGNAL(finished()), this, SLOT(finishedHead()));
     connect(_pCurrentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
@@ -55,8 +53,8 @@ void DownloadManagerHTTP::pause()
     {
         return;
     }
-    _pTimer->stop();
-    disconnect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
+    _Timer.stop();
+    disconnect(&_Timer, SIGNAL(timeout()), this, SLOT(timeout()));
     disconnect(_pCurrentReply, SIGNAL(finished()), this, SLOT(finished()));
     disconnect(_pCurrentReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64)));
     disconnect(_pCurrentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
@@ -94,10 +92,10 @@ void DownloadManagerHTTP::download()
 
     _pCurrentReply = _pManager->get(_CurrentRequest);
 
-    _pTimer->setInterval(5000);
-    _pTimer->setSingleShot(true);
-    connect(_pTimer, SIGNAL(timeout()), this, SLOT(timeout()));
-    _pTimer->start();
+    _Timer.setInterval(5000);
+    _Timer.setSingleShot(true);
+    connect(&_Timer, SIGNAL(timeout()), this, SLOT(timeout()));
+    _Timer.start();
 
     connect(_pCurrentReply, SIGNAL(finished()), this, SLOT(finished()));
     connect(_pCurrentReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64)));
@@ -107,7 +105,7 @@ void DownloadManagerHTTP::download()
 
 void DownloadManagerHTTP::finishedHead()
 {
-    _pTimer->stop();
+    _Timer.stop();
     _bAcceptRanges = false;
 
     QList<QByteArray> list = _pCurrentReply->rawHeaderList();
@@ -145,7 +143,7 @@ void DownloadManagerHTTP::finished()
 {
     qDebug() << __FUNCTION__;
 
-    _pTimer->stop();
+    _Timer.stop();
     _pFile->close();
     QFile::remove(_qsFileName);
     _pFile->rename(_qsFileName + ".part", _qsFileName);
@@ -157,7 +155,7 @@ void DownloadManagerHTTP::finished()
 
 void DownloadManagerHTTP::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
-    _pTimer->stop();
+    _Timer.stop();
     _nDownloadSize = _nDownloadSizeAtPause + bytesReceived;
     qDebug() << "Download Progress: Received=" << _nDownloadSize <<": Total=" << _nDownloadSizeAtPause + bytesTotal;
 
@@ -166,7 +164,7 @@ void DownloadManagerHTTP::downloadProgress(qint64 bytesReceived, qint64 bytesTot
     qDebug() << nPercentage;
     emit progress(nPercentage);
 
-    _pTimer->start(5000);
+    _Timer.start(5000);
 }
 
 

diff --git a/downloadmanagerHTTP.h b/downloadmanagerHTTP.h
@@ -46,7 +46,7 @@ private slots:
     bool _bAcceptRanges;
     int _nDownloadSize;
     int _nDownloadSizeAtPause;
-    QTimer *_pTimer;
+    QTimer _Timer;
 };
 
 #endif // DOWNLOADMANAGERHTTP_H