thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Fix compilation with disabled cloud but enabled libcurl

Browse source
This commit is contained in:
Eugene Sandulenko 2016-10-17 18:45:12 +02:00
parent d3c173da7a
commit e8b70a4686
12 changed files with 46 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gui/saveload-dialog.cpp
View file

@ -22,7 +22,7 @@
#include "gui/saveload-dialog.h"
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
#include "backends/cloud/cloudmanager.h"
#include "backends/cloud/savessyncrequest.h"
#include "backends/networking/curl/connectionmanager.h"
@ -41,7 +41,7 @@
namespace GUI {
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
enum {
kCancelSyncCmd = 'PDCS',
@ -157,7 +157,7 @@ SaveLoadChooserDialog::SaveLoadChooserDialog(int x, int y, int w, int h, const b
}
SaveLoadChooserDialog::~SaveLoadChooserDialog() {
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
CloudMan.setSyncTarget(nullptr); //not that dialog, at least
#endif
}
@ -173,7 +173,7 @@ void SaveLoadChooserDialog::open() {
}
void SaveLoadChooserDialog::close() {
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
CloudMan.setSyncTarget(nullptr); //not that dialog, at least
#endif
Dialog::close();
@ -215,7 +215,7 @@ void SaveLoadChooserDialog::handleCommand(CommandSender *sender, uint32 cmd, uin
}
#endif // !DISABLE_SAVELOADCHOOSER_GRID
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
if (cmd == kSavesSyncProgressCmd || cmd == kSavesSyncEndedCmd) {
//this dialog only gets these commands if the progress dialog was shown and user clicked "run in background"
return updateSaveList();
@ -225,7 +225,7 @@ void SaveLoadChooserDialog::handleCommand(CommandSender *sender, uint32 cmd, uin
return Dialog::handleCommand(sender, cmd, data);
}
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
void SaveLoadChooserDialog::runSaveSync(bool hasSavepathOverride) {
if (!CloudMan.isSyncing()) {
if (hasSavepathOverride) {
@ -240,7 +240,7 @@ void SaveLoadChooserDialog::runSaveSync(bool hasSavepathOverride) {
#endif
void SaveLoadChooserDialog::handleTickle() {
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
if (!_dialogWasShown && CloudMan.isSyncing()) {
Common::Array<Common::String> files = CloudMan.getSyncingFiles();
if (!files.empty()) {
@ -280,7 +280,7 @@ void SaveLoadChooserDialog::reflowLayout() {
}
void SaveLoadChooserDialog::updateSaveList() {
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
Common::Array<Common::String> files = CloudMan.getSyncingFiles(); //returns empty array if not syncing
g_system->getSavefileManager()->updateSavefilesList(files);
#endif
@ -291,7 +291,7 @@ void SaveLoadChooserDialog::listSaves() {
if (!_metaEngine) return; //very strange
_saveList = _metaEngine->listSaves(_target.c_str());
#ifdef USE_LIBCURL
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
//if there is Cloud support, add currently synced files as "locked" saves in the list
if (_metaEngine->hasFeature(MetaEngine::kSimpleSavesNames)) {
Common::String pattern = _target + ".###";