Update LOG type enum avoiding conflict with Windows macros

Author: Lord-Grey

include/utils/Logger.h

@@ -17,18 +17,21 @@
 
 // stl includes
 #ifdef _WIN32
+
 #include <stdexcept>
 #endif
 
 #include <utils/global_defines.h>
 
+// ================================================================
+
 #define LOG_MESSAGE(severity, logger, ...)   (logger)->Message(severity, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
 
 // standard log messages
-#define Debug(logger, ...)   LOG_MESSAGE(Logger::DEBUG  , logger, __VA_ARGS__)
-#define Info(logger, ...)    LOG_MESSAGE(Logger::INFO   , logger, __VA_ARGS__)
-#define Warning(logger, ...) LOG_MESSAGE(Logger::WARNING, logger, __VA_ARGS__)
-#define Error(logger, ...)   LOG_MESSAGE(Logger::ERRORR , logger, __VA_ARGS__)
+#define Debug(logger, ...)   LOG_MESSAGE(Logger::LogLevel::LOG_DEBUG  , logger, __VA_ARGS__)
+#define Info(logger, ...)    LOG_MESSAGE(Logger::LogLevel::LOG_INFO   , logger, __VA_ARGS__)
+#define Warning(logger, ...) LOG_MESSAGE(Logger::LogLevel::LOG_WARNING, logger, __VA_ARGS__)
+#define Error(logger, ...)   LOG_MESSAGE(Logger::LogLevel::LOG_ERROR , logger, __VA_ARGS__)
 
 // conditional log messages
 #define DebugIf(condition, logger, ...)   if (condition) Debug(logger,   __VA_ARGS__)
@@ -43,13 +46,14 @@ class Logger : public QObject
 	Q_OBJECT
 
 public:
+
 	enum LogLevel {
-		UNSET    = 0,
-		DEBUG    = 1,
-		INFO     = 2,
-		WARNING  = 3,
-		ERRORR   = 4,
-		OFF      = 5
+		LOG_UNSET = 0,
+		LOG_DEBUG = 1,
+		LOG_INFO = 2,
+		LOG_WARNING = 3,
+		LOG_ERROR = 4,
+		LOG_OFF = 5
 	};
 
 	struct T_LOG_MESSAGE
@@ -65,7 +69,7 @@ class Logger : public QObject
 		QString      levelString;
 	};
 
-	static Logger*  getInstance(const QString & name = "", const QString & subName = "__", LogLevel minLevel=Logger::INFO);
+	static Logger*  getInstance(const QString & name = "", const QString & subName = "__", LogLevel minLevel= Logger::LogLevel::LOG_INFO);
 	static void     deleteInstance(const QString & name = "", const QString & subName = "__");
 	static void     setLogLevel(LogLevel level, const QString & name = "", const QString & subName = "__");
 	static LogLevel getLogLevel(const QString & name = "", const QString & subName = "__");
@@ -80,7 +84,7 @@ class Logger : public QObject
 	void newLogMessage(Logger::T_LOG_MESSAGE);
 
 protected:
-	Logger(const QString & name="", const QString & subName = "__", LogLevel minLevel = INFO);
+	Logger(const QString & name="", const QString & subName = "__", LogLevel minLevel = Logger::LogLevel::LOG_INFO);
 	~Logger() override;
 
 private:
@@ -123,7 +127,7 @@ class LoggerManager : public QObject
 
 public slots:
 	void handleNewLogMessage(const Logger::T_LOG_MESSAGE&);
-	QJsonArray getLogMessageBuffer(Logger::LogLevel filter=Logger::UNSET) const;
+	QJsonArray getLogMessageBuffer(Logger::LogLevel filter= Logger::LogLevel::LOG_UNSET) const;
 
 signals:
 	void newLogMessage(const Logger::T_LOG_MESSAGE&);

libsrc/leddevice/dev_hid/LedDeviceLightpack.cpp

@@ -82,7 +82,7 @@ bool LedDeviceLightpack::init(const QJsonObject &deviceConfig)
 		{
 			Debug(_log, "USB context initialized");
 
-			if ( _log->getMinLevel() == Logger::LogLevel::DEBUG )
+			if ( _log->getMinLevel() == Logger::LogLevel::LOG_DEBUG )
 			{
 				int logLevel = LIBUSB_LOG_LEVEL_INFO;
 				#if LIBUSB_API_VERSION >= 0x01000106

libsrc/utils/Logger.cpp

@@ -18,33 +18,33 @@
 
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-	QRecursiveMutex        Logger::MapLock;
+QRecursiveMutex        Logger::MapLock;
 #else
-	QMutex                 Logger::MapLock{ QMutex::Recursive };
+QMutex                 Logger::MapLock{ QMutex::Recursive };
 #endif
 
-QMap<QString,Logger*>  Logger::LoggerMap            { };
-QAtomicInteger<int>    Logger::GLOBAL_MIN_LOG_LEVEL { static_cast<int>(Logger::UNSET)};
+QMap<QString, Logger*>  Logger::LoggerMap{ };
+QAtomicInteger<int>    Logger::GLOBAL_MIN_LOG_LEVEL{ static_cast<int>(Logger::LogLevel::LOG_UNSET) };
 
 namespace
 {
-const char * LogLevelStrings[]   = { "", "DEBUG", "INFO", "WARNING", "ERROR", "OFF" };
+	const char* LogLevelStrings[] = { "", "DEBUG", "INFO", "WARNING", "ERROR", "OFF" };
 #ifndef _WIN32
-const int    LogLevelSysLog[]    = { LOG_DEBUG, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERR };
+	const int    LogLevelSysLog[] = { LOG_DEBUG, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERR };
 #endif
 
-const size_t MAX_IDENTIFICATION_LENGTH = 22;
+	const size_t MAX_IDENTIFICATION_LENGTH = 22;
 
-QAtomicInteger<unsigned int> LoggerCount = 0;
-QAtomicInteger<unsigned int> LoggerId    = 0;
+	QAtomicInteger<unsigned int> LoggerCount = 0;
+	QAtomicInteger<unsigned int> LoggerId = 0;
 
-const int MAX_LOG_MSG_BUFFERED = 500;
-const int MaxRepeatCountSize = 200;
-QThreadStorage<int> RepeatCount;
-QThreadStorage<Logger::T_LOG_MESSAGE> RepeatMessage;
+	const int MAX_LOG_MSG_BUFFERED = 500;
+	const int MaxRepeatCountSize = 200;
+	QThreadStorage<int> RepeatCount;
+	QThreadStorage<Logger::T_LOG_MESSAGE> RepeatMessage;
 } // namespace
 
-Logger* Logger::getInstance(const QString & name, const QString & subName, Logger::LogLevel minLevel)
+Logger* Logger::getInstance(const QString& name, const QString& subName, Logger::LogLevel minLevel)
 {
 	QMutexLocker lock(&MapLock);
 
@@ -59,26 +59,26 @@ Logger* Logger::getInstance(const QString & name, const QString & subName, Logge
 	return log;
 }
 
-void Logger::deleteInstance(const QString & name, const QString & subName)
+void Logger::deleteInstance(const QString& name, const QString& subName)
 {
 	QMutexLocker lock(&MapLock);
 
 	if (name.isEmpty())
 	{
-		for (auto *logger : std::as_const(LoggerMap)) {
+		for (auto* logger : std::as_const(LoggerMap)) {
 			logger->deleteLater();
 		}
 
 		LoggerMap.clear();
 	}
 	else
 	{
-		 LoggerMap.value(name + subName, nullptr)->deleteLater();
+		LoggerMap.value(name + subName, nullptr)->deleteLater();
 		LoggerMap.remove(name + subName);
 	}
 }
 
-void Logger::setLogLevel(LogLevel level, const QString & name, const QString & subName)
+void Logger::setLogLevel(LogLevel level, const QString& name, const QString& subName)
 {
 	if (name.isEmpty())
 	{
@@ -91,7 +91,7 @@ void Logger::setLogLevel(LogLevel level, const QString & name, const QString & s
 	}
 }
 
-Logger::LogLevel Logger::getLogLevel(const QString & name, const QString & subName)
+Logger::LogLevel Logger::getLogLevel(const QString& name, const QString& subName)
 {
 	if (name.isEmpty())
 	{
@@ -102,7 +102,7 @@ Logger::LogLevel Logger::getLogLevel(const QString & name, const QString & subNa
 	return log->getMinLevel();
 }
 
-Logger::Logger (const QString & name, const QString & subName, LogLevel minLevel)
+Logger::Logger(const QString& name, const QString& subName, LogLevel minLevel)
 	: QObject()
 	, _name(name)
 	, _subName(subName)
@@ -117,7 +117,7 @@ Logger::Logger (const QString & name, const QString & subName, LogLevel minLevel
 #ifndef _WIN32
 		if (_syslogEnabled)
 		{
-			openlog (nullptr, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
+			openlog(nullptr, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
 		}
 #endif
 	}
@@ -136,10 +136,10 @@ Logger::~Logger()
 	}
 }
 
-void Logger::write(const Logger::T_LOG_MESSAGE & message)
+void Logger::write(const Logger::T_LOG_MESSAGE& message)
 {
 	QString location;
-	if (message.level == Logger::DEBUG)
+	if (message.level == Logger::LogLevel::LOG_DEBUG)
 	{
 		location = QString("%1:%2:%3() | ")
 			.arg(message.fileName)
@@ -151,11 +151,12 @@ void Logger::write(const Logger::T_LOG_MESSAGE & message)
 	name.resize(MAX_IDENTIFICATION_LENGTH, ' ');
 
 	const QDateTime timestamp = QDateTime::fromMSecsSinceEpoch(message.utime);
-	QString msg = timestamp.toString(Qt::ISODateWithMs)
-		% " " % name
-		% " : <" % LogLevelStrings[message.level]
-		% "> " % location
-		% message.message % "\n";
+	QString msg = QString("%1 %2 : <%3> %4%5\n")
+		.arg(timestamp.toString(Qt::ISODateWithMs))
+		.arg(name)
+		.arg(LogLevelStrings[message.level])
+		.arg(location)
+		.arg(message.message);
 
 #ifdef _WIN32
 	if (IsDebuggerPresent())
@@ -164,49 +165,49 @@ void Logger::write(const Logger::T_LOG_MESSAGE & message)
 	}
 	else
 #endif
-	std::cout << msg.toStdString();
+		std::cout << msg.toStdString();
 
 	emit newLogMessage(message);
 }
 
 void Logger::Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...)
 {
-	Logger::LogLevel globalLevel = static_cast<Logger::LogLevel>(int(GLOBAL_MIN_LOG_LEVEL));
+	LogLevel globalLevel = LogLevel(int(GLOBAL_MIN_LOG_LEVEL));
 
-	if ( (globalLevel == Logger::UNSET && level < _minLevel) // no global level, use level from logger
-		 || (globalLevel > Logger::UNSET && level < globalLevel) ) // global level set, use global level
+	if ((globalLevel == Logger::LogLevel::LOG_UNSET && level < _minLevel) // no global level, use level from logger
+		|| (globalLevel > LogLevel::LOG_UNSET && level < globalLevel)) // global level set, use global level
 	{
 		return;
 	}
 
 	const size_t max_msg_length = 1024;
 	char msg[max_msg_length];
 	va_list args;
-	va_start (args, fmt);
-	vsnprintf (msg, max_msg_length, fmt, args);
-	va_end (args);
+	va_start(args, fmt);
+	vsnprintf(msg, max_msg_length, fmt, args);
+	va_end(args);
 
 	const auto repeatedSummary = [&]
-	{
-		Logger::T_LOG_MESSAGE repMsg = RepeatMessage.localData();
-		repMsg.message = "Previous line repeats " + QString::number(RepeatCount.localData()) + " times";
-		repMsg.utime   = QDateTime::currentMSecsSinceEpoch();
+		{
+			Logger::T_LOG_MESSAGE repMsg = RepeatMessage.localData();
+			repMsg.message = "Previous line repeats " + QString::number(RepeatCount.localData()) + " times";
+			repMsg.utime = QDateTime::currentMSecsSinceEpoch();
 
-		write(repMsg);
+			write(repMsg);
 #ifndef _WIN32
-		if ( _syslogEnabled && repMsg.level >= Logger::WARNING )
-		{
-			syslog (LogLevelSysLog[repMsg.level], "Previous line repeats %d times", RepeatCount.localData());
-		}
+			if (_syslogEnabled && repMsg.level >= Logger::WARNING)
+			{
+				syslog(LogLevelSysLog[repMsg.level], "Previous line repeats %d times", RepeatCount.localData());
+			}
 #endif
 
-		RepeatCount.setLocalData(0);
-	};
+			RepeatCount.setLocalData(0);
+		};
 
-	if (RepeatMessage.localData().loggerName == _name  &&
-		RepeatMessage.localData().loggerSubName == _subName  &&
+	if (RepeatMessage.localData().loggerName == _name &&
+		RepeatMessage.localData().loggerSubName == _subName &&
 		RepeatMessage.localData().function == func &&
-		RepeatMessage.localData().message == msg   &&
+		RepeatMessage.localData().message == msg &&
 		RepeatMessage.localData().line == line)
 	{
 		if (RepeatCount.localData() >= MaxRepeatCountSize)
@@ -227,21 +228,21 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
 
 		Logger::T_LOG_MESSAGE logMsg;
 
-		logMsg.loggerName  = _name;
-		logMsg.loggerSubName  = _subName;
-		logMsg.function    = QString(func);
-		logMsg.line        = line;
-		logMsg.fileName    = FileUtils::getBaseName(sourceFile);
-		logMsg.utime       = QDateTime::currentMSecsSinceEpoch();
-		logMsg.message     = QString(msg);
-		logMsg.level       = level;
+		logMsg.loggerName = _name;
+		logMsg.loggerSubName = _subName;
+		logMsg.function = QString(func);
+		logMsg.line = line;
+		logMsg.fileName = FileUtils::getBaseName(sourceFile);
+		logMsg.utime = QDateTime::currentMSecsSinceEpoch();
+		logMsg.message = QString(msg);
+		logMsg.level = level;
 		logMsg.levelString = LogLevelStrings[level];
 
 		write(logMsg);
 #ifndef _WIN32
-		if ( _syslogEnabled && level >= Logger::WARNING )
+		if (_syslogEnabled && level >= Logger::WARNING)
 		{
-			syslog (LogLevelSysLog[level], "%s", msg);
+			syslog(LogLevelSysLog[level], "%s", msg);
 		}
 #endif
 		RepeatMessage.setLocalData(logMsg);
@@ -269,7 +270,7 @@ QJsonArray LoggerManager::getLogMessageBuffer(Logger::LogLevel filter) const
 {
 	QJsonArray messageArray;
 	{
-		for (const auto &logLine : std::as_const(_logMessageBuffer))
+		for (const auto& logLine : std::as_const(_logMessageBuffer))
 		{
 			if (logLine.level >= filter)
 			{
@@ -290,7 +291,7 @@ QJsonArray LoggerManager::getLogMessageBuffer(Logger::LogLevel filter) const
 	return messageArray;
 }
 
-void LoggerManager::handleNewLogMessage(const Logger::T_LOG_MESSAGE & msg)
+void LoggerManager::handleNewLogMessage(const Logger::T_LOG_MESSAGE& msg)
 {
 	_logMessageBuffer.push_back(msg);
 	if (_logMessageBuffer.length() > _loggerMaxMsgBufferSize)

src/hyperion-aml/hyperion-aml.cpp

@@ -46,7 +46,7 @@ int main(int argc, char ** argv)
 	ErrorManager errorManager;
 
 	Logger *log = Logger::getInstance(CAPTURE_TYPE.toUpper());
-	Logger::setLogLevel(Logger::INFO);
+	Logger::setLogLevel(Logger::LOG_INFO);
 
 	QCoreApplication const app(argc, argv);
 
@@ -92,7 +92,7 @@ int main(int argc, char ** argv)
 	// check if debug logging is required
 	if (parser.isSet(argDebug))
 	{
-		Logger::setLogLevel(Logger::DEBUG);
+		Logger::setLogLevel(Logger::LOG_DEBUG);
 	}
 
 	// check if we need to display the usage. exit if we do.

src/hyperion-dispmanx/hyperion-dispmanx.cpp

@@ -48,7 +48,7 @@ int main(int argc, char ** argv)
 	ErrorManager errorManager;
 
 	Logger *log = Logger::getInstance(CAPTURE_TYPE.toUpper());
-	Logger::setLogLevel(Logger::INFO);
+	Logger::setLogLevel(Logger::LOG_INFO);
 
 	QCoreApplication const app(argc, argv);
 
@@ -94,7 +94,7 @@ int main(int argc, char ** argv)
 	// check if debug logging is required
 	if (parser.isSet(argDebug))
 	{
-		Logger::setLogLevel(Logger::DEBUG);
+		Logger::setLogLevel(Logger::LOG_DEBUG);
 	}
 
 

src/hyperion-framebuffer/hyperion-framebuffer.cpp

@@ -47,7 +47,7 @@ int main(int argc, char ** argv)
 	ErrorManager errorManager;
 
 	Logger *log = Logger::getInstance(CAPTURE_TYPE.toUpper());
-	Logger::setLogLevel(Logger::INFO);
+	Logger::setLogLevel(Logger::LOG_INFO);
 
 	QCoreApplication const app(argc, argv);
 
@@ -95,7 +95,7 @@ int main(int argc, char ** argv)
 	// check if debug logging is required
 	if (parser.isSet(argDebug))
 	{
-		Logger::setLogLevel(Logger::DEBUG);
+		Logger::setLogLevel(Logger::LOG_DEBUG);
 	}
 
 	// check if we need to display the usage. exit if we do.