libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 23:43:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALL: Reduce assignment of "" to Common::String.

Browse Source 
When clearing an existant object clear() should be used.

When constructing objects (or using default values for parameters) the
constructor of String without any argument should be used.

This changes only a few instances I noticed while looking over some recent
commit logs.
This commit is contained in:
Johannes Schickel 2011-10-23 20:02:35 +02:00
parent a41d72a44a
commit 3a196478c6
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/mididrv.cpp
View File

@ -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)

2
common/util.cpp
View File

@ -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]))

4
engines/game.h
View File

@ -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);
/**

4
gui/options.cpp
View File

@ -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);

2
gui/saveload.cpp
View File

@ -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();