diff options
| -rw-r--r-- | audio/mididrv.cpp | 2 | ||||
| -rw-r--r-- | common/util.cpp | 2 | ||||
| -rw-r--r-- | engines/game.h | 4 | ||||
| -rw-r--r-- | gui/options.cpp | 4 | ||||
| -rw-r--r-- | gui/saveload.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp index f638250dcd..829bc3cd55 100644 --- a/audio/mididrv.cpp +++ b/audio/mididrv.cpp @@ -74,7 +74,7 @@ static const struct { }; Common::String MidiDriver::musicType2GUIO(uint32 musicType) { - Common::String res = ""; + Common::String res; for (int i = 0; GUIOMapping[i].guio; i++) { if (musicType == GUIOMapping[i].type || musicType == (uint32)-1) diff --git a/common/util.cpp b/common/util.cpp index bd2ebc4937..1f1b8a1440 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -381,7 +381,7 @@ String parseGameGUIOptions(const String &str) { } const String getGameGUIOptionsDescription(const String &options) { - String res = ""; + String res; for (int i = 0; g_gameOptions[i].desc; i++) if (options.contains(g_gameOptions[i].option[0])) diff --git a/engines/game.h b/engines/game.h index 23512e89b8..d5136936bc 100644 --- a/engines/game.h +++ b/engines/game.h @@ -65,12 +65,12 @@ enum GameSupportLevel { class GameDescriptor : public Common::StringMap { public: GameDescriptor(); - GameDescriptor(const PlainGameDescriptor &pgd, Common::String guioptions = ""); + GameDescriptor(const PlainGameDescriptor &pgd, Common::String guioptions = Common::String()); GameDescriptor(const Common::String &gameid, const Common::String &description, Common::Language language = Common::UNK_LANG, Common::Platform platform = Common::kPlatformUnknown, - Common::String guioptions = "", + Common::String guioptions = Common::String(), GameSupportLevel gsl = kStableGame); /** diff --git a/gui/options.cpp b/gui/options.cpp index 67204fc343..ad2e3d92d0 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -141,7 +141,7 @@ void OptionsDialog::init() { _oldTheme = g_gui.theme()->getThemeId(); // Retrieve game GUI options - _guioptions = ""; + _guioptions.clear(); if (ConfMan.hasKey("guioptions", _domain)) { _guioptionsString = ConfMan.get("guioptions", _domain); _guioptions = parseGameGUIOptions(_guioptionsString); @@ -155,7 +155,7 @@ void OptionsDialog::open() { setResult(0); // Retrieve game GUI options - _guioptions = ""; + _guioptions.clear(); if (ConfMan.hasKey("guioptions", _domain)) { _guioptionsString = ConfMan.get("guioptions", _domain); _guioptions = parseGameGUIOptions(_guioptionsString); diff --git a/gui/saveload.cpp b/gui/saveload.cpp index ae950a21fb..3dc9961906 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -92,7 +92,7 @@ int SaveLoadChooser::runModalWithPluginAndTarget(const EnginePlugin *plugin, con _thumbnailSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportThumbnail); _saveDateSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportCreationDate); _playTimeSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportPlayTime); - _resultString = ""; + _resultString.clear(); reflowLayout(); updateSaveList(); |