diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-07-16 17:20:21 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-07-16 13:56:46 -0700 |
| commit | 0dd40b7a514a2ea02c2f4160a74b23c0fb9a41dd (patch) | |
| tree | 466d6e7e87c7a8a808a87484555431dad535e13d /qt-ui/updatemanager.cpp | |
| parent | bbbb4ced241c156a2500334ff29ba0ea496d3811 (diff) | |
| download | subsurface-0dd40b7a514a2ea02c2f4160a74b23c0fb9a41dd.tar.gz | |
Rely on QNetworkReply finished() signal instead of AccessManager one
The access manager is only one, while we can make requests from
different parts of the application, so relying on the manager
finished() signal to see if something was done or not was a
not very good move.
The QNetworkReply is created when a get() is invocked on the
AccessManager and that's unique. connect it's finished()
signal instead.
bonus: code cleanup.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/updatemanager.cpp')
| -rw-r--r-- | qt-ui/updatemanager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qt-ui/updatemanager.cpp b/qt-ui/updatemanager.cpp index 51292fcbd..b790a6104 100644 --- a/qt-ui/updatemanager.cpp +++ b/qt-ui/updatemanager.cpp @@ -6,8 +6,6 @@ UpdateManager::UpdateManager(QObject *parent) : QObject(parent) { - manager = SubsurfaceWebServices::manager(); - connect(manager, SIGNAL(finished(QNetworkReply *)), SLOT(requestReceived(QNetworkReply *))); } void UpdateManager::checkForUpdates() @@ -26,16 +24,16 @@ void UpdateManager::checkForUpdates() QString version = VERSION_STRING; QString url = QString("http://subsurface.hohndel.org/updatecheck.html?os=%1&ver=%2").arg(os, version); - manager->get(QNetworkRequest(QUrl(url))); + connect(SubsurfaceWebServices::manager()->get(QNetworkRequest(QUrl(url))), SIGNAL(finished()), this, SLOT(requestReceived())); } -void UpdateManager::requestReceived(QNetworkReply *reply) +void UpdateManager::requestReceived() { QMessageBox msgbox; QString msgTitle = tr("Check for updates."); QString msgText = "<h3>" + tr("Subsurface was unable to check for updates.") + "</h3>"; - + QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender()); if (reply->error() != QNetworkReply::NoError) { //Network Error msgText = msgText + "<br/><b>" + tr("The following error occurred:") + "</b><br/>" + reply->errorString() |