diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-26 09:49:47 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-01-26 09:51:58 -0800 |
| commit | 6a8768ee262aa3debfe8868fa7a5da13e0ba3a3b (patch) | |
| tree | 8614bbacbd71b1e38230b93d384665fd62bdb15d | |
| parent | 7a682770ef5cd1d314771cde216194ff0a6d40fb (diff) | |
| download | subsurface-6a8768ee262aa3debfe8868fa7a5da13e0ba3a3b.tar.gz | |
Fix build breakage
Introduced in commit 31462f150dff ("We already have a QNetworkAcessManager
global, use it").
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/diveshareexportdialog.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/preferences/preferences_network.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/subsurfacewebservices.h | 2 | ||||
| -rw-r--r-- | desktop-widgets/updatemanager.cpp | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp index 435f5366e..c6a7771d8 100644 --- a/desktop-widgets/diveshareexportdialog.cpp +++ b/desktop-widgets/diveshareexportdialog.cpp @@ -4,6 +4,7 @@ #include "save-html.h" #include "subsurfacewebservices.h" #include "helpers.h" +#include "subsurface-core/cloudstorage.h" #include <QDesktopServices> #include <QSettings> @@ -135,7 +136,7 @@ void DiveShareExportDialog::doUpload() if (ui->txtUID->text().length() != 0) 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())); } diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index cbdeebe8b..818a16f1b 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -3,6 +3,7 @@ #include "dive.h" #include "subsurfacewebservices.h" #include "subsurface-core/prefs-macros.h" +#include "subsurface-core/cloudstorage.h" #include <QNetworkProxy> #include <QSettings> diff --git a/desktop-widgets/subsurfacewebservices.h b/desktop-widgets/subsurfacewebservices.h index 7b629db13..c00b6f63f 100644 --- a/desktop-widgets/subsurfacewebservices.h +++ b/desktop-widgets/subsurfacewebservices.h @@ -20,8 +20,6 @@ public: void hideUpload(); void hideDownload(); - static QNetworkAccessManager *manager(); - private slots: virtual void startDownload() = 0; diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp index 2ab92b3a5..daa65e007 100644 --- a/desktop-widgets/updatemanager.cpp +++ b/desktop-widgets/updatemanager.cpp @@ -7,6 +7,7 @@ #include "subsurfacewebservices.h" #include "version.h" #include "mainwindow.h" +#include "subsurface-core/cloudstorage.h" UpdateManager::UpdateManager(QObject *parent) : QObject(parent), @@ -58,7 +59,7 @@ void UpdateManager::checkForUpdates(bool automatic) request.setRawHeader("Accept", "text/xml"); QString userAgent = getUserAgent(); 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() |