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/usersurvey.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/usersurvey.cpp')
-rw-r--r-- | qt-ui/usersurvey.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qt-ui/usersurvey.cpp b/qt-ui/usersurvey.cpp index 997064042..24e2070e0 100644 --- a/qt-ui/usersurvey.cpp +++ b/qt-ui/usersurvey.cpp @@ -40,8 +40,6 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent), sysInfo.append(tr("\nLanguage: %1").arg(uiLanguage(NULL))); os.append(QString("&uiLang=%1").arg(uiLanguage(NULL))); ui->system->setPlainText(sysInfo); - manager = SubsurfaceWebServices::manager(); - connect(manager, SIGNAL(finished(QNetworkReply *)), SLOT(requestReceived(QNetworkReply *))); } UserSurvey::~UserSurvey() @@ -64,7 +62,7 @@ void UserSurvey::on_buttonBox_accepted() ADD_OPTION(companion); values.append(QString("&suggestion=%1").arg(ui->suggestions->toPlainText())); UserSurveyServices uss(this); - uss.sendSurvey(values); + connect(uss.sendSurvey(values), SIGNAL(finished()), SLOT(requestReceived())); hide(); } @@ -90,13 +88,13 @@ void UserSurvey::on_buttonBox_rejected() hide(); } -void UserSurvey::requestReceived(QNetworkReply *reply) +void UserSurvey::requestReceived() { QMessageBox msgbox; QString msgTitle = tr("Submit user survey."); QString msgText = "<h3>" + tr("Subsurface was unable to submit the user survey.") + "</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() |