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

Fix build breakage

Browse source 
Introduced in commit 31462f150dff ("We already have a QNetworkAcessManager
global, use it").

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-26 09:49:47 -08:00
parent 7a682770ef
commit 6a8768ee26
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/diveshareexportdialog.cpp
View file

@ -4,6 +4,7 @@
#include "save-html.h" #include "save-html.h"
#include "subsurfacewebservices.h" #include "subsurfacewebservices.h"
#include "helpers.h" #include "helpers.h"
#include "subsurface-core/cloudstorage.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QSettings> #include <QSettings>
@ -135,7 +136,7 @@ void DiveShareExportDialog::doUpload()
if (ui->txtUID->text().length() != 0) if (ui->txtUID->text().length() != 0)
request.setRawHeader("X-UID", ui->txtUID->text().toUtf8()); request.setRawHeader("X-UID", ui->txtUID->text().toUtf8());
reply = WebServices::manager()->put(request, json_data); reply = manager()->put(request, json_data);
QObject::connect(reply, SIGNAL(finished()), this, SLOT(finishedSlot())); QObject::connect(reply, SIGNAL(finished()), this, SLOT(finishedSlot()));
} }

1
desktop-widgets/preferences/preferences_network.cpp
View file

@ -3,6 +3,7 @@
#include "dive.h" #include "dive.h"
#include "subsurfacewebservices.h" #include "subsurfacewebservices.h"
#include "subsurface-core/prefs-macros.h" #include "subsurface-core/prefs-macros.h"
#include "subsurface-core/cloudstorage.h"
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QSettings> #include <QSettings>

2
desktop-widgets/subsurfacewebservices.h
View file

@ -20,8 +20,6 @@ public:
void hideUpload(); void hideUpload();
void hideDownload(); void hideDownload();
static QNetworkAccessManager *manager();
private private
slots: slots:
virtual void startDownload() = 0; virtual void startDownload() = 0;

3
desktop-widgets/updatemanager.cpp
View file

@ -7,6 +7,7 @@
#include "subsurfacewebservices.h" #include "subsurfacewebservices.h"
#include "version.h" #include "version.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "subsurface-core/cloudstorage.h"
UpdateManager::UpdateManager(QObject *parent) : UpdateManager::UpdateManager(QObject *parent) :
QObject(parent), QObject(parent),
@ -58,7 +59,7 @@ void UpdateManager::checkForUpdates(bool automatic)
request.setRawHeader("Accept", "text/xml"); request.setRawHeader("Accept", "text/xml");
QString userAgent = getUserAgent(); QString userAgent = getUserAgent();
request.setRawHeader("User-Agent", userAgent.toUtf8()); request.setRawHeader("User-Agent", userAgent.toUtf8());
connect(SubsurfaceWebServices::manager()->get(request), SIGNAL(finished()), this, SLOT(requestReceived()), Qt::UniqueConnection); connect(manager()->get(request), SIGNAL(finished()), this, SLOT(requestReceived()), Qt::UniqueConnection);
} }
void UpdateManager::requestReceived() void UpdateManager::requestReceived()