Port to KF6

Author: Tatsh

CMakeLists.txt

@@ -1,43 +1,50 @@
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+
 project(ktexteditor_wakatime)
 
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+set(QT_MAJOR_VERSION "6")
+set(QT_MIN_VERSION "6.5.0")
+set(KF5_DEP_VERSION "6.0.0")
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"katewakatime\")
 
-find_package(ECM 1.1.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+find_package(ECM ${KF5_DEP_VERSION} REQUIRED NO_MODULE)
+list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
 include(ECMInstallIcons)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 
 # Sane flags from Kate project
-add_definitions(-DQT_USE_QSTRINGBUILDER
-                -DQT_NO_CAST_TO_ASCII
-                -DQT_NO_CAST_FROM_ASCII
-                -DQT_STRICT_ITERATORS
-                -DQT_NO_URL_CAST_FROM_STRING
-                -DQT_NO_CAST_FROM_BYTEARRAY
-                -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-                -DQT_USE_FAST_OPERATOR_PLUS)
+add_definitions(
+  -DQT_USE_QSTRINGBUILDER
+  -DQT_NO_CAST_TO_ASCII
+  -DQT_NO_CAST_FROM_ASCII
+  -DQT_STRICT_ITERATORS
+  -DQT_NO_URL_CAST_FROM_STRING
+  -DQT_NO_CAST_FROM_BYTEARRAY
+  -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+  -DQT_USE_FAST_OPERATOR_PLUS)
 
 # Needed to find the moc file
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(KF5TextEditor NO_MODULE)
-find_package(Qt5Sql REQUIRED)
+find_package(Qt6Sql REQUIRED)
+find_package(KF6 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n TextEditor)
 
 set(ktexteditor_wakatime_SRCS wakatimeplugin.cpp offlinequeue.cpp)
 
 ki18n_wrap_ui(ktexteditor_wakatime_SRCS configdialog.ui)
-qt5_add_resources(ktexteditor_wakatime_SRCS plugin.qrc)
+qt6_add_resources(ktexteditor_wakatime_SRCS plugin.qrc)
 
 add_library(ktexteditor_wakatime MODULE ${ktexteditor_wakatime_SRCS})
 
-kcoreaddons_desktop_to_json(ktexteditor_wakatime ktexteditor_wakatime.desktop
-                            DEFAULT_SERVICE_TYPE)
-
-target_link_libraries(ktexteditor_wakatime KF5::TextEditor Qt5::Sql)
+target_link_libraries(ktexteditor_wakatime KF6::I18n KF6::TextEditor Qt6::Sql)
 
 install(TARGETS ktexteditor_wakatime
         DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor)
@@ -53,9 +60,5 @@ set(WAKATIME_ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/48-apps-wakatime.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/64-apps-wakatime.png)
 
-ecm_install_icons(ICONS
-                  ${WAKATIME_ICONS}
-                  DESTINATION
-                  ${ICON_INSTALL_DIR}
-                  THEME
-                  hicolor)
+ecm_install_icons(ICONS ${WAKATIME_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR}
+                  THEME hicolor)

README.md

@@ -1,6 +1,10 @@
 # Note
 
-This is for Kate 5 (KTextEditor from KF 5). If you need a version for Kate 4, use the [v0.6 release](https://github.com/Tatsh/kate-wakatime/releases).
+This is for Kate 6 (KTextEditor from KF 6).
+
+If you need a version for Kate 5, use the [v1.3.10 release](https://github.com/Tatsh/kate-wakatime/releases).
+
+If you need a version for Kate 4, use the [v0.6 release](https://github.com/Tatsh/kate-wakatime/releases).
 
 ## Dependencies
 

ktexteditor_wakatime.json

@@ -0,0 +1,5 @@
+{
+  "KPlugin": {
+    "Name": "WakaTime"
+  }
+}

wakatimeplugin.cpp

@@ -30,14 +30,13 @@
 #include <KTextEditor/MainWindow>
 #include <KTextEditor/View>
 
-#include <KCoreAddons/KAboutData>
-#include <KCoreAddons/KPluginFactory>
-#include <KCoreAddons/KPluginLoader>
-#include <KF5/KTextEditor/ktexteditor_version.h>
-#include <KI18n/KLocalizedString>
-#include <KWidgetsAddons/KMessageBox>
-#include <KXmlGui/KActionCollection>
-#include <KXmlGui/KXMLGUIFactory>
+#include <KAboutData>
+#include <KPluginFactory>
+#include <KF6/KTextEditor/ktexteditor_version.h>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KActionCollection>
+#include <KXMLGUIFactory>
 
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>

wakatimeplugin.h

@@ -51,7 +51,7 @@ class WakaTimeView;
 
 class WakaTimePlugin : public KTextEditor::Plugin {
 public:
-    explicit WakaTimePlugin(QObject *parent = 0,
+    explicit WakaTimePlugin(QObject *parent = nullptr,
                             const QList<QVariant> & = QList<QVariant>());
     virtual ~WakaTimePlugin();
     QObject *createView(KTextEditor::MainWindow *mainWindow) override;