Mercurial > public > ostc_companion
comparison main.cpp @ 2:177f640940f2
Update exception class and cleanup redifinitions
During firmware download and exception caused the application to stop.
Rootcause was the defference between QT5 and QT6 exception and string
handling which is updated now. In addition some old definitions were
removed to avoid compiler warnings.
| author | Ideenmodellierer |
|---|---|
| date | Fri, 28 Nov 2025 19:57:35 +0100 |
| parents | 0b3630a29ad8 |
| children |
comparison
equal
deleted
inserted
replaced
| 1:0b3630a29ad8 | 2:177f640940f2 |
|---|---|
| 74 oss << msg; \ | 74 oss << msg; \ |
| 75 LogAction(Log::LEVEL_TRACE, __FILE__, __LINE__, LOG_FUNCTION_) << oss.str(); \ | 75 LogAction(Log::LEVEL_TRACE, __FILE__, __LINE__, LOG_FUNCTION_) << oss.str(); \ |
| 76 } \ | 76 } \ |
| 77 } while(0) | 77 } while(0) |
| 78 #endif | 78 #endif |
| 79 #if 0 | |
| 79 #define LOG_TRACE(msg) \ | 80 #define LOG_TRACE(msg) \ |
| 80 do { \ | 81 do { \ |
| 81 if(Log::minLevel <= Log::LEVEL_TRACE) { \ | 82 if(Log::minLevel <= Log::LEVEL_TRACE) { \ |
| 82 LogAction(Log::LEVEL_TRACE, __FILE__, __LINE__, LOG_FUNCTION_) << QString("%1").arg(msg); \ | 83 LogAction(Log::LEVEL_TRACE, __FILE__, __LINE__, LOG_FUNCTION_) << QString("%1").arg(msg); \ |
| 83 } \ | 84 } \ |
| 84 } while(0) | 85 } while(0) |
| 85 | 86 #endif |
| 86 #ifdef Q_OS_WIN32 | 87 #ifdef Q_OS_WIN32 |
| 87 | 88 |
| 88 auto os = QOperatingSystemVersion::current(); | 89 auto os = QOperatingSystemVersion::current(); |
| 89 | 90 |
| 90 if (os >= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10)) { | 91 if (os >= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10)) { |
