[education/rkward] rkward: Fix some warnings
Thomas Friedrichsmeier
null at kde.org
Tue Apr 22 16:39:03 BST 2025
Git commit 870b7cb89764a6b268be4c397efb400cd94f012d by Thomas Friedrichsmeier.
Committed on 22/04/2025 at 15:17.
Pushed by tfry into branch 'master'.
Fix some warnings
M +1 -1 rkward/misc/rkxmlguipreviewarea.cpp
M +5 -1 rkward/windows/rktoplevelwindowgui.cpp
https://invent.kde.org/education/rkward/-/commit/870b7cb89764a6b268be4c397efb400cd94f012d
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index ec451db9b..06549c8d2 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -234,7 +234,7 @@ friend class RKPreviewManager;
update();
});
}
- void paintEvent(QPaintEvent *event) {
+ void paintEvent(QPaintEvent *event) override {
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
painter.setPen(pen);
diff --git a/rkward/windows/rktoplevelwindowgui.cpp b/rkward/windows/rktoplevelwindowgui.cpp
index a2aaa201f..5872151ab 100644
--- a/rkward/windows/rktoplevelwindowgui.cpp
+++ b/rkward/windows/rktoplevelwindowgui.cpp
@@ -17,8 +17,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <kshortcutsdialog.h>
#include <KHelpMenu>
#include <KColorSchemeManager>
+#include <kcolorscheme_version.h>
#include <KActionMenu>
-#include <kconfigwidgets_version.h>
#include <QWhatsThis>
#include <QDomDocument>
@@ -94,7 +94,11 @@ RKTopLevelWindowGUI::RKTopLevelWindowGUI(KXmlGuiWindow *for_window) : QObject(fo
KStandardAction::keyBindings(this, &RKTopLevelWindowGUI::configureShortcuts, actionCollection());
KStandardAction::configureToolbars(this, &RKTopLevelWindowGUI::configureToolbars, actionCollection());
// Color scheme action. NOTE: selection is non-permanent for KF5 <= 5.87.0, auto-saved afterwards. Apparently, auto-save cannot be implemented for earlier versions within a few lines of code
+#if KCOLORSCHEME_VERSION >= QT_VERSION_CHECK(6,6,0) // NOTE: When retiring this version check, obsolete the "manager"-member along with it
+ KColorSchemeManager *manager = KColorSchemeManager::instance();
+#else
KColorSchemeManager *manager = new KColorSchemeManager(this);
+#endif
actionCollection()->addAction(QStringLiteral("colorscheme_menu"), KColorSchemeMenu::createMenu(manager, this));
// our "status bar" is inlined, and always visible. Action below would only hide and show a useless proxy
// KF6 TODO: Still needed at all?
More information about the rkward-tracker
mailing list