Qt6 Compat

.gitignore

@@ -40,3 +40,4 @@ doc/
 *.pro.user
 *.pro.user.*
 CMakeLists.txt.user
+.idea

CMakeLists.txt

@@ -1,56 +1,41 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.5)
 
-SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-PROJECT(CuteLogger)
-
-FIND_PACKAGE(Qt5Core REQUIRED)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+project(CuteLogger LANGUAGES CXX)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Core5Compat REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Core5Compat REQUIRED)
 ADD_DEFINITIONS(-DCUTELOGGER_LIBRARY)
-
-INCLUDE_DIRECTORIES(BEFORE include)
-
-SET(sources
-  src/Logger.cpp
-  src/AbstractAppender.cpp
-  src/AbstractStringAppender.cpp
-  src/ConsoleAppender.cpp
-  src/FileAppender.cpp
-  src/RollingFileAppender.cpp
-)
-
-SET(includes
-  include/Logger.h
-  include/FileAppender.h
-  include/CuteLogger_global.h
-  include/ConsoleAppender.h
-  include/AbstractStringAppender.h
-  include/AbstractAppender.h
-  include/RollingFileAppender.h
-)
-
+add_library(CuteLogger SHARED "")
+target_sources(CuteLogger PRIVATE
+        src/Logger.cpp
+        src/AbstractAppender.cpp
+        src/AbstractStringAppender.cpp
+        src/ConsoleAppender.cpp
+        src/FileAppender.cpp
+        src/RollingFileAppender.cpp
+        )
+target_compile_definitions(CuteLogger PRIVATE -DCUTELOGGER_LIBRARY)
+target_include_directories(CuteLogger PUBLIC include)
+target_link_libraries(CuteLogger PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Core5Compat)
 
 # OutputDebugAppender is only for Windows systems
-IF(WIN32)
-  SET(sources ${sources} src/OutputDebugAppender.cpp)
-  SET(includes ${includes} include/OutputDebugAppender.h)
-ENDIF(WIN32)
-
-
-SET(library_target CuteLogger)
+if(WIN32)
+  target_sources(CuteLogger PRIVATE
+          src/OutputDebugAppender.cpp
+          )
+endif(WIN32)
 
-ADD_LIBRARY(${library_target} SHARED ${sources} ${includes})
-TARGET_LINK_LIBRARIES(${library_target} Qt5::Core)
-TARGET_INCLUDE_DIRECTORIES(${library_target} PUBLIC include)
+install(TARGETS CuteLogger DESTINATION lib)
 
-INSTALL(TARGETS ${library_target} DESTINATION lib)
-
-SET(ENABLE_TESTS OFF CACHE BOOL "Enable building CuteLogger tests")
+set(ENABLE_TESTS OFF CACHE BOOL "Enable building CuteLogger tests")
 IF (ENABLE_TESTS)
-  SET(CMAKE_AUTOMOC ON)
-  FIND_PACKAGE(Qt5Test REQUIRED)
-
-  ADD_EXECUTABLE(basictest test/basictest.cpp)
-  TARGET_LINK_LIBRARIES(basictest Qt5::Core Qt5::Test CuteLogger)
+  enable_testing()
+  find_package(QT NAMES Qt6 Qt5 COMPONENTS Test REQUIRED)
+  find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED)
+  add_executable(basictest test/basictest.cpp)
+  add_test(basictest basictest)
+  set_target_properties(basictest PROPERTIES AUTOMOC ON)
+  target_link_libraries(basictest Qt${QT_VERSION_MAJOR}::Test CuteLogger)
 ENDIF ()

include/Logger.h

@@ -18,6 +18,7 @@
 #include <QString>
 #include <QDebug>
 #include <QDateTime>
+#include <QElapsedTimer>
 
 // Local
 #include "CuteLogger_global.h"
@@ -224,7 +225,7 @@ class CUTELOGGERSHARED_EXPORT LoggerTimingHelper
 
   private:
     Logger* m_logger;
-    QTime m_time;
+    QElapsedTimer m_time;
     Logger::LogLevel m_logLevel;
     Logger::TimingMode m_timingMode;
     const char* m_file;

src/AbstractStringAppender.cpp

@@ -21,6 +21,7 @@
 #include <QWriteLocker>
 #include <QDateTime>
 #include <QRegExp>
+#include <QRegularExpression>
 #include <QCoreApplication>
 #include <QThread>
 
@@ -405,7 +406,7 @@ QString AbstractStringAppender::formattedString(const QDateTime& timeStamp, Logg
 
       // Filename without a path
       else if (command == QLatin1String("file"))
-        chunk = QString(QLatin1String(file)).section(QRegExp("[/\\\\]"), -1);
+        chunk = QString(QLatin1String(file)).section(QRegularExpression("[/\\\\]"), -1);
 
       // Source line number
       else if (command == QLatin1String("line"))

src/Logger.cpp

@@ -600,8 +600,8 @@ Logger::~Logger()
 
   // Cleanup appenders
   QMutexLocker appendersLocker(&d->loggerMutex);
-  QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders));
-  deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values()));
+  QSet<AbstractAppender*> deleteList(d->appenders.begin(), d->appenders.end());
+  deleteList.unite(QSet<AbstractAppender*>(d->categoryAppenders.values().begin(), d->categoryAppenders.values().end()));
   qDeleteAll(deleteList);
 
   appendersLocker.unlock();
@@ -1032,7 +1032,7 @@ void LoggerTimingHelper::start(const char* msg, ...)
 {
   va_list va;
   va_start(va, msg);
-  m_block = QString().vsprintf(msg, va);
+  m_block = QString::vasprintf(msg, va);
   va_end(va);
 
   m_time.start();

src/RollingFileAppender.cpp

@@ -200,7 +200,7 @@ void RollingFileAppender::computeRollOverTime()
     break;
     default:
       Q_ASSERT_X(false, "DailyRollingFileAppender::computeInterval()", "Invalid datePattern constant");
-      m_rollOverTime = QDateTime::fromTime_t(0);
+      m_rollOverTime = QDateTime::fromSecsSinceEpoch(0);
   }
 
   m_rollOverSuffix = start.toString(m_datePatternString);