summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/subsurfacewebservices.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-09-29 22:47:19 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-29 15:16:11 -0700
commit7c22e4d805f3ae23938fdfedcb02e53d26966dfd (patch)
tree9c07004707b10d2080e608901f53966a80112cc8 /desktop-widgets/subsurfacewebservices.cpp
parent7c320854b3328be3ba1bfe65adfc118d4e2313d1 (diff)
downloadsubsurface-7c22e4d805f3ae23938fdfedcb02e53d26966dfd.tar.gz
Cleanup: don't derive UserSurveyServices from WebServices
UserSurveyServices derives from WebServices and therefore has to define three pure virtual functions [startDownload(), startUpload(), buttonClicked()] as no-ops. Interestingly, a comment in the header says "need to declare them as no ops or Qt4 is unhappy" which is of course not true as these functions are not declared by Qt. There seems to be no point in deriving from WebServices, therefore don't do it. These function definitions can then be removed. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/subsurfacewebservices.cpp')
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 2dd39bffd..a7586c128 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -793,17 +793,16 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton *button)
}
}
-UserSurveyServices::UserSurveyServices(QWidget *parent, Qt::WindowFlags f) : WebServices(parent, f)
+UserSurveyServices::UserSurveyServices(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
{
-
}
-QNetworkReply* UserSurveyServices::sendSurvey(QString values)
+QNetworkReply *UserSurveyServices::sendSurvey(QString values)
{
QNetworkRequest request;
request.setUrl(QString("http://subsurface-divelog.org/survey?%1").arg(values));
request.setRawHeader("Accept", "text/xml");
- request.setRawHeader("User-Agent", userAgent.toUtf8());
- reply = manager()->get(request);
+ request.setRawHeader("User-Agent", getUserAgent().toUtf8());
+ QNetworkReply *reply = manager()->get(request);
return reply;
}