mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: don't derive UserSurveyServices from WebServices

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-09-29 22:47:19 +02:00 committed by Dirk Hohndel
parent 7c320854b3
commit 7c22e4d805
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop-widgets/subsurfacewebservices.cpp
View file

@ -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;
}

8
desktop-widgets/subsurfacewebservices.h
View file

@ -77,17 +77,11 @@ private:
bool uploadMode;
};
class UserSurveyServices : public WebServices {
class UserSurveyServices : public QDialog {
Q_OBJECT
public:
QNetworkReply* sendSurvey(QString values);
explicit UserSurveyServices(QWidget *parent = 0, Qt::WindowFlags f = 0);
private
slots:
// need to declare them as no ops or Qt4 is unhappy
void startDownload() { }
void startUpload() { }
void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) }
};
#endif // SUBSURFACEWEBSERVICES_H