[Scummvm-cvs-logs] SF.net SVN: scummvm:[46781] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Dec 31 00:01:36 CET 2009
Revision: 46781
http://scummvm.svn.sourceforge.net/scummvm/?rev=46781&view=rev
Author: fingolfin
Date: 2009-12-30 23:01:36 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
Get rid of Common::String::emptyString, and also of some port specific hackery (getting rid of certain global C++ objs)
Modified Paths:
--------------
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/config-manager.h
scummvm/trunk/common/str.cpp
scummvm/trunk/common/str.h
scummvm/trunk/gui/PopUpWidget.h
scummvm/trunk/gui/saveload.cpp
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/common/config-manager.cpp 2009-12-30 23:01:36 UTC (rev 46781)
@@ -40,17 +40,6 @@
namespace Common {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
-
-const String ConfigManager::kApplicationDomain("scummvm");
-const String ConfigManager::kTransientDomain("__TRANSIENT");
-
-#ifdef ENABLE_KEYMAPPER
-const String ConfigManager::kKeymapperDomain("keymapper");
-#endif
-
-#else
-
const char *ConfigManager::kApplicationDomain = "scummvm";
const char *ConfigManager::kTransientDomain = "__TRANSIENT";
@@ -58,13 +47,10 @@
const char *ConfigManager::kKeymapperDomain = "keymapper";
#endif
-#endif
-
#pragma mark -
-ConfigManager::ConfigManager()
- : _activeDomain(0) {
+ConfigManager::ConfigManager() : _activeDomain(0) {
}
@@ -407,11 +393,7 @@
else if (_defaultsDomain.contains(key))
return _defaultsDomain[key];
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
- return String::emptyString;
-#else
- return ConfMan._emptyString;
-#endif
+ return _emptyString;
}
const String & ConfigManager::get(const String &key, const String &domName) const {
@@ -434,12 +416,8 @@
if (!domain->contains(key)) {
#if 1
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
- return String::emptyString;
+ return _emptyString;
#else
- return ConfMan._emptyString;
-#endif
-#else
error("ConfigManager::get(%s,%s) called on non-existent key",
key.c_str(), domName.c_str());
#endif
@@ -641,11 +619,7 @@
if (iter != end())
return iter->_value;
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
- return String::emptyString;
-#else
return ConfMan._emptyString;
-#endif
}
void ConfigManager::Domain::setDomainComment(const String &comment) {
Modified: scummvm/trunk/common/config-manager.h
===================================================================
--- scummvm/trunk/common/config-manager.h 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/common/config-manager.h 2009-12-30 23:01:36 UTC (rev 46781)
@@ -68,31 +68,17 @@
typedef HashMap<String, Domain, IgnoreCase_Hash, IgnoreCase_EqualTo> DomainMap;
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
/** The name of the application domain (normally 'scummvm'). */
- static const String kApplicationDomain;
+ static const char *kApplicationDomain;
/** The transient (pseudo) domain. */
- static const String kTransientDomain;
-
-#ifdef ENABLE_KEYMAPPER
- /** The name of keymapper domain used to store the key maps */
- static const String kKeymapperDomain;
-#endif
-
-#else
- static const char *kApplicationDomain;
static const char *kTransientDomain;
- const String _emptyString;
-
#ifdef ENABLE_KEYMAPPER
/** The name of keymapper domain used to store the key maps */
static const char *kKeymapperDomain;
#endif
-#endif
-
void loadDefaultConfigFile();
void loadConfigFile(const String &filename);
@@ -179,6 +165,8 @@
Domain * _activeDomain;
String _filename;
+
+ const String _emptyString;
};
} // End of namespace Common
Modified: scummvm/trunk/common/str.cpp
===================================================================
--- scummvm/trunk/common/str.cpp 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/common/str.cpp 2009-12-30 23:01:36 UTC (rev 46781)
@@ -37,13 +37,6 @@
namespace Common {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
-const String String::emptyString;
-#else
-const char *String::emptyString = "";
-#endif
-
-
MemoryPool *g_refCountPool = 0; // FIXME: This is never freed right now
static uint32 computeCapacity(uint32 len) {
Modified: scummvm/trunk/common/str.h
===================================================================
--- scummvm/trunk/common/str.h 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/common/str.h 2009-12-30 23:01:36 UTC (rev 46781)
@@ -90,12 +90,6 @@
}
public:
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
- static const String emptyString;
-#else
- static const char *emptyString;
-#endif
-
/** Construct a new empty string. */
String() : _size(0), _str(_storage) { _storage[0] = 0; }
Modified: scummvm/trunk/gui/PopUpWidget.h
===================================================================
--- scummvm/trunk/gui/PopUpWidget.h 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/gui/PopUpWidget.h 2009-12-30 23:01:36 UTC (rev 46781)
@@ -75,7 +75,7 @@
int getSelected() const { return _selectedItem; }
uint32 getSelectedTag() const { return (_selectedItem >= 0) ? _entries[_selectedItem].tag : (uint32)-1; }
- const String& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : String::emptyString; }
+// const String& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : String::emptyString; }
void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); }
void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); draw(); }
Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp 2009-12-30 23:01:16 UTC (rev 46780)
+++ scummvm/trunk/gui/saveload.cpp 2009-12-30 23:01:36 UTC (rev 46781)
@@ -114,7 +114,8 @@
}
const Common::String &SaveLoadChooser::getResultString() const {
- return (_list->getSelected() > -1) ? _list->getSelectedString() : _resultString;
+ int selItem = _list->getSelected();
+ return (selItem >= 0) ? _list->getSelectedString() : _resultString;
}
void SaveLoadChooser::setSaveMode(bool saveMode) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list