Fixed log levels

src/lib/globals.cpp

@@ -57,7 +57,7 @@ public:
     /**
      * Existing Log levels. The id value corresponds to the index in the vector
      */
-    QList<LogLevel *> mLogLevels;
+    QHash<Globals::LogLevelIds, LogLevel *> mLogLevels;
 
     QList<LogModeFactory *> mFactories;
 
@@ -126,40 +126,40 @@ void Globals::setupLogLevels()
 
     d->mNoLogLevel = new LogLevel(NONE_LOG_LEVEL_ID, i18n("None"), QStringLiteral("edit-none"),
                                   QColor(208, 210, 220));
-    d->mLogLevels.append(d->mNoLogLevel);
+    d->mLogLevels[NONE_LOG_LEVEL_ID] = d->mNoLogLevel;
 
     d->mDebugLogLevel
         = new LogLevel(DEBUG_LOG_LEVEL_ID, i18n("Debug"), QStringLiteral("debug-run"), QColor(156, 157, 165));
-    d->mLogLevels.append(d->mDebugLogLevel);
+    d->mLogLevels[DEBUG_LOG_LEVEL_ID] = d->mDebugLogLevel;
 
     d->mInformationLogLevel
         = new LogLevel(INFORMATION_LOG_LEVEL_ID, i18n("Information"), QStringLiteral("dialog-information"),
                        QColor(36, 49, 103) /*QColor(0, 0, 0)*/);
-    d->mLogLevels.append(d->mInformationLogLevel);
+    d->mLogLevels[INFORMATION_LOG_LEVEL_ID] = d->mInformationLogLevel;
 
     d->mNoticeLogLevel
         = new LogLevel(NOTICE_LOG_LEVEL_ID, i18n("Notice"), QStringLiteral("note"), QColor(36, 138, 22));
-    d->mLogLevels.append(d->mNoticeLogLevel);
+    d->mLogLevels[NOTICE_LOG_LEVEL_ID] = d->mNoticeLogLevel;
 
     d->mWarningLogLevel = new LogLevel(WARNING_LOG_LEVEL_ID, i18n("Warning"), QStringLiteral("dialog-warning"),
                                        QColor(238, 144, 21));
-    d->mLogLevels.append(d->mWarningLogLevel);
+    d->mLogLevels[WARNING_LOG_LEVEL_ID] = d->mWarningLogLevel;
 
     d->mErrorLogLevel
         = new LogLevel(ERROR_LOG_LEVEL_ID, i18n("Error"), QStringLiteral("dialog-error"), QColor(173, 28, 28));
-    d->mLogLevels.append(d->mErrorLogLevel);
+    d->mLogLevels[ERROR_LOG_LEVEL_ID] = d->mErrorLogLevel;
 
     d->mCriticalLogLevel
         = new LogLevel(CRITICAL_LOG_LEVEL_ID, i18n("Critical"), QStringLiteral("dialog-error"), QColor(214, 26, 26));
-    d->mLogLevels.append(d->mCriticalLogLevel);
+    d->mLogLevels[CRITICAL_LOG_LEVEL_ID] = d->mCriticalLogLevel;
 
     d->mAlertLogLevel
         = new LogLevel(ALERT_LOG_LEVEL_ID, i18n("Alert"), QStringLiteral("preferences-desktop-notification-bell"), QColor(214, 0, 0));
-    d->mLogLevels.append(d->mAlertLogLevel);
+    d->mLogLevels[ALERT_LOG_LEVEL_ID] = d->mAlertLogLevel;
 
     d->mEmergencyLogLevel = new LogLevel(EMERGENCY_LOG_LEVEL_ID, i18n("Emergency"),
                                          QStringLiteral("application-exit"), QColor(255, 0, 0));
-    d->mLogLevels.append(d->mEmergencyLogLevel);
+    d->mLogLevels[EMERGENCY_LOG_LEVEL_ID] = d->mEmergencyLogLevel;
 }
 
 QList<LogMode *> Globals::logModes() const
@@ -167,7 +167,7 @@ QList<LogMode *> Globals::logModes() const
     return d->mLogModes.values();
 }
 
-QList<LogLevel *> Globals::logLevels() const
+QHash<Globals::LogLevelIds, LogLevel *> Globals::logLevels() const
 {
     return d->mLogLevels;
 }

src/lib/globals.h

@@ -69,7 +69,7 @@ public:
 
     QString formatDate(DateFormat format, const QDateTime &dateTime) const;
 
-    QList<LogLevel *> logLevels() const;
+    QHash<LogLevelIds, LogLevel *> logLevels() const;
 
     LogLevel *noLogLevel() const;
     LogLevel *debugLogLevel() const;

src/modes/audit/auditConfiguration.cpp

@@ -2,8 +2,11 @@
 
 #include "auditLogMode.h"
 
+#include "globals.h"
+
 AuditConfiguration::AuditConfiguration()
     : GenericLogModeConfiguration(QStringLiteral(AUDIT_LOG_MODE_ID),
-                                  {QStringLiteral("/var/log/audit/audit.log")}, {2})
+                                  {QStringLiteral("/var/log/audit/audit.log")},
+                                  {Globals::LogLevelIds::INFORMATION_LOG_LEVEL_ID})
 {
 }

src/modes/base/genericConfiguration.cpp

@@ -83,11 +83,8 @@ QList<LogFile> GenericLogModeConfiguration::findGenericLogFiles() const
         const int intValue = itInt.next();
         const QString stringValue = itString.next();
 
-        if (intValue >= 0 && intValue < static_cast<int>(Globals::instance().logLevels().count())) {
-            level = Globals::instance().logLevels().at(intValue);
-        } else {
-            level = Globals::instance().informationLogLevel();
-        }
+        level = Globals::instance().logLevels().value(Globals::LogLevelIds(intValue),
+                                                      Globals::instance().informationLogLevel());
 
         const QUrl url = QUrl::fromLocalFile(stringValue);
         if (!url.isValid()) {

src/modes/base/logLevelFileList.cpp

@@ -144,8 +144,8 @@ void LogLevelFileList::changeItemType()
 
 LogLevel *LogLevelFileList::level(int i) const
 {
-    return Globals::instance().logLevels().at(
-        fileList->item(i)->data(LogLevelFileList::LogLevelRole).toInt());
+    return Globals::instance().logLevels().value(
+        Globals::LogLevelIds(fileList->item(i)->data(LogLevelFileList::LogLevelRole).toInt()));
 }
 
 QList<int> LogLevelFileList::levels() const
@@ -184,13 +184,8 @@ void LogLevelFileList::addPaths(const QStringList &stringList, const QList<int>
             missingFile = true;
         }
 
-        LogLevel *level;
-        if (valueInt >= 0 && valueInt < static_cast<int>(Globals::instance().logLevels().count())) {
-            level = Globals::instance().logLevels().at(valueInt);
-        } else {
-            level = Globals::instance().informationLogLevel();
-        }
-
+        LogLevel *level = Globals::instance().logLevels().value(Globals::LogLevelIds(valueInt),
+                                                                Globals::instance().informationLogLevel());
         insertItem(level, valueString, missingFile);
     }