Log level/type: Use enum class instead of the awkward namespace trick.

Just a small cleanup I've wanted to do for a long time.
This commit is contained in:
Henrik Rydgård committed 2023-08-25 11:48:59 +02:00
1 parent 308e983a99
commit 1025bbcf89
19 files changed
+162 -170

No files matched your search

+12 -12
View File
@@ -224,12 +224,12 @@ void LogScreen::UpdateLog() {
TextView *v = vert_->Add(new TextView(ring->TextAt(i), FLAG_DYNAMIC_ASCII, false));
uint32_t color = 0xFFFFFF;
switch (ring->LevelAt(i)) {
case LogTypes::LDEBUG: color = 0xE0E0E0; break;
case LogTypes::LWARNING: color = 0x50FFFF; break;
case LogTypes::LERROR: color = 0x5050FF; break;
case LogTypes::LNOTICE: color = 0x30FF30; break;
case LogTypes::LINFO: color = 0xFFFFFF; break;
case LogTypes::LVERBOSE: color = 0xC0C0C0; break;
case LogLevel::LDEBUG: color = 0xE0E0E0; break;
case LogLevel::LWARNING: color = 0x50FFFF; break;
case LogLevel::LERROR: color = 0x5050FF; break;
case LogLevel::LNOTICE: color = 0x30FF30; break;
case LogLevel::LINFO: color = 0xFFFFFF; break;
case LogLevel::LVERBOSE: color = 0xC0C0C0; break;
}
v->SetTextColor(0xFF000000 | color);
}
@@ -308,7 +308,7 @@ void LogConfigScreen::CreateViews() {
GridLayout *grid = vert->Add(new GridLayoutList(gridsettings, new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
for (int i = 0; i < LogManager::GetNumChannels(); i++) {
LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
LogType type = (LogType)i;
LogChannel *chan = logMan->GetLogChannel(type);
LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(cellSize - 50, WRAP_CONTENT));
row->SetSpacing(0);
@@ -321,7 +321,7 @@ void LogConfigScreen::CreateViews() {
UI::EventReturn LogConfigScreen::OnToggleAll(UI::EventParams &e) {
LogManager *logMan = LogManager::GetInstance();
for (int i = 0; i < LogManager::GetNumChannels(); i++) {
LogChannel *chan = logMan->GetLogChannel((LogTypes::LOG_TYPE)i);
LogChannel *chan = logMan->GetLogChannel((LogType)i);
chan->enabled = !chan->enabled;
}
return UI::EVENT_DONE;
@@ -330,7 +330,7 @@ UI::EventReturn LogConfigScreen::OnToggleAll(UI::EventParams &e) {
UI::EventReturn LogConfigScreen::OnEnableAll(UI::EventParams &e) {
LogManager *logMan = LogManager::GetInstance();
for (int i = 0; i < LogManager::GetNumChannels(); i++) {
LogChannel *chan = logMan->GetLogChannel((LogTypes::LOG_TYPE)i);
LogChannel *chan = logMan->GetLogChannel((LogType)i);
chan->enabled = true;
}
return UI::EVENT_DONE;
@@ -339,7 +339,7 @@ UI::EventReturn LogConfigScreen::OnEnableAll(UI::EventParams &e) {
UI::EventReturn LogConfigScreen::OnDisableAll(UI::EventParams &e) {
LogManager *logMan = LogManager::GetInstance();
for (int i = 0; i < LogManager::GetNumChannels(); i++) {
LogChannel *chan = logMan->GetLogChannel((LogTypes::LOG_TYPE)i);
LogChannel *chan = logMan->GetLogChannel((LogType)i);
chan->enabled = false;
}
return UI::EVENT_DONE;
@@ -377,10 +377,10 @@ void LogLevelScreen::OnCompleted(DialogResult result) {
LogManager *logMan = LogManager::GetInstance();
for (int i = 0; i < LogManager::GetNumChannels(); ++i) {
LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
LogType type = (LogType)i;
LogChannel *chan = logMan->GetLogChannel(type);
if (chan->enabled)
chan->level = (LogTypes::LOG_LEVELS)(selected + 1);
chan->level = (LogLevel)(selected + 1);
}
}