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

COMMON: Rename DebugManager global/member names

Browse source
This commit is contained in:
sluicebox 2021-06-09 18:28:50 -06:00
parent 8e1d90f8e4
commit fa247d13de
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/commandLine.cpp
View file

@ -979,7 +979,7 @@ static void printDebugFlags(const DebugChannelDef *debugChannels) {
/** List debug flags*/ /** List debug flags*/
static void listDebugFlags(const Common::String &engineID) { static void listDebugFlags(const Common::String &engineID) {
if (engineID == "global") if (engineID == "global")
printDebugFlags(globalDebugChannels); printDebugFlags(gDebugChannels);
else { else {
const PluginList &plugins = EngineMan.getPlugins(); const PluginList &plugins = EngineMan.getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) { for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {

6
common/debug-channels.h
View file

@ -160,11 +160,11 @@ public:
private: private:
typedef HashMap<String, DebugChannel, IgnoreCase_Hash, IgnoreCase_EqualTo> DebugChannelMap; typedef HashMap<String, DebugChannel, IgnoreCase_Hash, IgnoreCase_EqualTo> DebugChannelMap;
DebugChannelMap gDebugChannels; DebugChannelMap _debugChannels;
uint32 gDebugChannelsEnabled; uint32 _debugChannelsEnabled;
friend class Singleton<SingletonBaseType>; friend class Singleton<SingletonBaseType>;
DebugManager() : gDebugChannelsEnabled(0) {} DebugManager() : _debugChannelsEnabled(0) {}
}; };
/** Shortcut for accessing the Debug Manager. */ /** Shortcut for accessing the Debug Manager. */

36
common/debug.cpp
View file

@ -52,28 +52,28 @@ bool DebugManager::addDebugChannel(uint32 channel, const String &name, const Str
return false; return false;
} }
if (gDebugChannels.contains(name)) if (_debugChannels.contains(name))
warning("Duplicate declaration of engine debug channel '%s'", name.c_str()); warning("Duplicate declaration of engine debug channel '%s'", name.c_str());
for (DebugChannelMap::iterator i = gDebugChannels.begin(); i != gDebugChannels.end(); i++) for (DebugChannelMap::iterator i = _debugChannels.begin(); i != _debugChannels.end(); i++)
if (i->_value.channel == channel) if (i->_value.channel == channel)
error("Duplicate engine debug channel id '%d' for flag '%s'", channel, name.c_str()); error("Duplicate engine debug channel id '%d' for flag '%s'", channel, name.c_str());
gDebugChannels[name] = DebugChannel(channel, name, description); _debugChannels[name] = DebugChannel(channel, name, description);
return true; return true;
} }
void DebugManager::clearAllDebugChannels() { void DebugManager::clearAllDebugChannels() {
gDebugChannelsEnabled = 0; _debugChannelsEnabled = 0;
gDebugChannels.clear(); _debugChannels.clear();
} }
bool DebugManager::enableDebugChannel(const String &name) { bool DebugManager::enableDebugChannel(const String &name) {
DebugChannelMap::iterator i = gDebugChannels.find(name); DebugChannelMap::iterator i = _debugChannels.find(name);
if (i != gDebugChannels.end()) { if (i != _debugChannels.end()) {
gDebugChannelsEnabled |= i->_value.channel; _debugChannelsEnabled |= i->_value.channel;
i->_value.enabled = true; i->_value.enabled = true;
return true; return true;
@ -83,15 +83,15 @@ bool DebugManager::enableDebugChannel(const String &name) {
} }
bool DebugManager::enableDebugChannel(uint32 channel) { bool DebugManager::enableDebugChannel(uint32 channel) {
gDebugChannelsEnabled |= channel; _debugChannelsEnabled |= channel;
return true; return true;
} }
bool DebugManager::disableDebugChannel(const String &name) { bool DebugManager::disableDebugChannel(const String &name) {
DebugChannelMap::iterator i = gDebugChannels.find(name); DebugChannelMap::iterator i = _debugChannels.find(name);
if (i != gDebugChannels.end()) { if (i != _debugChannels.end()) {
gDebugChannelsEnabled &= ~i->_value.channel; _debugChannelsEnabled &= ~i->_value.channel;
i->_value.enabled = false; i->_value.enabled = false;
return true; return true;
@ -101,13 +101,13 @@ bool DebugManager::disableDebugChannel(const String &name) {
} }
bool DebugManager::disableDebugChannel(uint32 channel) { bool DebugManager::disableDebugChannel(uint32 channel) {
gDebugChannelsEnabled &= ~channel; _debugChannelsEnabled &= ~channel;
return true; return true;
} }
DebugManager::DebugChannelList DebugManager::listDebugChannels() { DebugManager::DebugChannelList DebugManager::listDebugChannels() {
DebugChannelList tmp; DebugChannelList tmp;
for (DebugChannelMap::iterator i = gDebugChannels.begin(); i != gDebugChannels.end(); ++i) for (DebugChannelMap::iterator i = _debugChannels.begin(); i != _debugChannels.end(); ++i)
tmp.push_back(i->_value); tmp.push_back(i->_value);
sort(tmp.begin(), tmp.end(), DebugLevelComperator()); sort(tmp.begin(), tmp.end(), DebugLevelComperator());
@ -115,12 +115,12 @@ DebugManager::DebugChannelList DebugManager::listDebugChannels() {
} }
void DebugManager::enableAllDebugChannels() { void DebugManager::enableAllDebugChannels() {
for (DebugChannelMap::iterator i = gDebugChannels.begin(); i != gDebugChannels.end(); ++i) for (DebugChannelMap::iterator i = _debugChannels.begin(); i != _debugChannels.end(); ++i)
enableDebugChannel(i->_value.name); enableDebugChannel(i->_value.name);
} }
void DebugManager::disableAllDebugChannels() { void DebugManager::disableAllDebugChannels() {
for (DebugChannelMap::iterator i = gDebugChannels.begin(); i != gDebugChannels.end(); ++i) for (DebugChannelMap::iterator i = _debugChannels.begin(); i != _debugChannels.end(); ++i)
disableDebugChannel(i->_value.name); disableDebugChannel(i->_value.name);
} }
@ -129,7 +129,7 @@ bool DebugManager::isDebugChannelEnabled(uint32 channel, bool enforce) {
if (gDebugLevel == 11 && enforce == false) if (gDebugLevel == 11 && enforce == false)
return true; return true;
else else
return (gDebugChannelsEnabled & channel) != 0; return (_debugChannelsEnabled & channel) != 0;
} }
void DebugManager::debugFlagsRegister(const DebugChannelDef *channels) { void DebugManager::debugFlagsRegister(const DebugChannelDef *channels) {
@ -144,7 +144,7 @@ void DebugManager::debugFlagsClear() {
// first we clear all the debug channels // first we clear all the debug channels
// then we add the global debug flags // then we add the global debug flags
clearAllDebugChannels(); clearAllDebugChannels();
debugFlagsRegister(globalDebugChannels); debugFlagsRegister(gDebugChannels);
} }
} // End of namespace Common } // End of namespace Common

2
common/debug.h
View file

@ -166,7 +166,7 @@ enum GlobalDebugLevels {
kDebugLevelEventRec = 1 << 30 kDebugLevelEventRec = 1 << 30
}; };
static const DebugChannelDef globalDebugChannels[] = { static const DebugChannelDef gDebugChannels[] = {
{kDebugLevelEventRec, "EventRec", "Event recorder debug level"}, {kDebugLevelEventRec, "EventRec", "Event recorder debug level"},
{kDebugGlobalDetection, "Detection", "debug messages for advancedDetector"}, {kDebugGlobalDetection, "Detection", "debug messages for advancedDetector"},
DEBUG_CHANNEL_END DEBUG_CHANNEL_END