[Scummvm-git-logs] scummvm master -> eb2625114ddaba8c521189311c11ad63d383c4f0
sev-
sev at scummvm.org
Fri Nov 12 13:50:21 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eb2625114d GUI: Fix compilation
Commit: eb2625114ddaba8c521189311c11ad63d383c4f0
https://github.com/scummvm/scummvm/commit/eb2625114ddaba8c521189311c11ad63d383c4f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-11-12T14:50:11+01:00
Commit Message:
GUI: Fix compilation
Changed paths:
gui/launcher.cpp
gui/remotebrowser.cpp
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 3b9e3368bf..c3995202a1 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -356,8 +356,8 @@ void LauncherDialog::addGame() {
if (_browser->runModal() > 0) {
// User made his choice...
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
- String selectedDirectory = _browser->getResult().getPath();
- String bannedDirectory = CloudMan.getDownloadLocalDirectory();
+ Common::String selectedDirectory = _browser->getResult().getPath();
+ Common::String bannedDirectory = CloudMan.getDownloadLocalDirectory();
if (selectedDirectory.size() && selectedDirectory.lastChar() != '/' && selectedDirectory.lastChar() != '\\')
selectedDirectory += '/';
if (bannedDirectory.size() && bannedDirectory.lastChar() != '/' && bannedDirectory.lastChar() != '\\') {
diff --git a/gui/remotebrowser.cpp b/gui/remotebrowser.cpp
index 15aa0da787..e8b368112f 100644
--- a/gui/remotebrowser.cpp
+++ b/gui/remotebrowser.cpp
@@ -144,7 +144,7 @@ void RemoteBrowserDialog::updateListing() {
if (!_navigationLocked) {
// Populate the ListWidget
- ListWidget::U32StringArray list;
+ Common::U32StringArray list;
ListWidget::ColorList colors;
for (Common::Array<Cloud::StorageFile>::iterator i = _nodeContent.begin(); i != _nodeContent.end(); ++i) {
if (i->isDirectory()) {
More information about the Scummvm-git-logs
mailing list