mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move helper functions around

Browse source 
We had a ton of helper functions in qt-gui.cpp which really didn't make
much sense. So I moved them all into qthelper.cpp.

Also moved the UserAgent helper that didn't belong in the UpdateHandler to
begin with - that's a generic helper used in many places...

With this we can successfully build using cmake again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-23 09:09:48 -08:00
parent 62999c866f
commit ddc01e39e7
9 changed files with 405 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/diveshareexportdialog.cpp
View file

@ -4,6 +4,7 @@
#include "save-html.h"
#include "usersurvey.h"
#include "subsurfacewebservices.h"
#include "helpers.h"
#include <QDesktopServices>
#include <QSettings>
@ -130,7 +131,7 @@ void DiveShareExportDialog::doUpload()
else
request.setUrl(QUrl(DIVESHARE_BASE_URI "/upload"));
request.setRawHeader("User-Agent", UserSurvey::getUserAgent().toUtf8());
request.setRawHeader("User-Agent", getUserAgent().toUtf8());
if (ui->txtUID->text().length() != 0)
request.setRawHeader("X-UID", ui->txtUID->text().toUtf8());

3
qt-ui/subsurfacewebservices.cpp
View file

@ -1,4 +1,5 @@
#include "subsurfacewebservices.h"
#include "helpers.h"
#include "webservice.h"
#include "mainwindow.h"
#include "usersurvey.h"
@ -232,7 +233,7 @@ WebServices::WebServices(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f
ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
timeout.setSingleShot(true);
defaultApplyText = ui.buttonBox->button(QDialogButtonBox::Apply)->text();
userAgent = UserSurvey::getUserAgent();
userAgent = getUserAgent();
}
void WebServices::hidePassword()

3
qt-ui/updatemanager.cpp
View file

@ -1,5 +1,6 @@
#include "updatemanager.h"
#include "usersurvey.h"
#include "helpers.h"
#include <QtNetwork>
#include <QMessageBox>
#include <QUuid>
@ -53,7 +54,7 @@ void UpdateManager::checkForUpdates(bool automatic)
QNetworkRequest request;
request.setUrl(url);
request.setRawHeader("Accept", "text/xml");
QString userAgent = UserSurvey::getUserAgent();
QString userAgent = getUserAgent();
request.setRawHeader("User-Agent", userAgent.toUtf8());
connect(SubsurfaceWebServices::manager()->get(request), SIGNAL(finished()), this, SLOT(requestReceived()), Qt::UniqueConnection);
}

16
qt-ui/usersurvey.cpp
View file

@ -49,22 +49,6 @@ QString UserSurvey::getVersion()
return sysInfo;
}
QString UserSurvey::getUserAgent()
{
QString arch;
// fill in the system data - use ':' as separator
// replace all other ':' with ' ' so that this is easy to parse
QString userAgent = QString("Subsurface:%1:").arg(subsurface_version());
userAgent.append(SubsurfaceSysInfo::prettyOsName().replace(':', ' ') + ":");
arch = SubsurfaceSysInfo::buildCpuArchitecture().replace(':', ' ');
userAgent.append(arch);
if (arch == "i386")
userAgent.append("/" + SubsurfaceSysInfo::currentCpuArchitecture());
userAgent.append(":" + uiLanguage(NULL));
return userAgent;
}
UserSurvey::~UserSurvey()
{
delete ui;

1
qt-ui/usersurvey.h
View file

@ -16,7 +16,6 @@ public:
explicit UserSurvey(QWidget *parent = 0);
~UserSurvey();
static QString getVersion();
static QString getUserAgent();
private
slots: