[education/rkward/kf5] rkward: Fix compilation error from windows

[Thomas Friedrichsmeier]

Git commit 9118076be57820aa4301a7337b223e0877717ddf by Thomas Friedrichsmeier, on behalf of Carl Schwan.
Committed on 01/04/2024 at 11:45.
Pushed by tfry into branch 'kf5'.

Fix compilation error from windows

M  +1    -1    rkward/dialogs/rkloadlibsdialog.cpp
M  +0    -8    rkward/rbackend/rksessionvars.cpp

https://invent.kde.org/education/rkward/-/commit/9118076be57820aa4301a7337b223e0877717ddf

diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlibsdialog.cpp
index 12fcd6edb..acad3c410 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -184,7 +184,7 @@ bool RKLoadLibsDialog::removePackages (QStringList packages, QStringList from_li
 	if (!not_writable.isEmpty ()) {
 #ifdef Q_OS_WIN
 		KMessageBox::informationList (this, i18n ("Your current user permissions do not allow removing the following packages. These will be skipped."), not_writable, i18n ("Insufficient user permissions"));
-		int res = KMessageBox::No;
+		int res = KMessageBox::SecondaryAction;
 #else
 		int res = KMessageBox::questionTwoActionsList (this, i18n ("Your current user permissions do not allow removing the following packages. Do you want to skip these packages, or do you want to proceed with administrator privileges (you will be prompted for the password)?"), not_writable, i18n ("Insufficient user permissions"), KGuiItem (i18nc("@action:button", "Become root")), KGuiItem (i18nc("@action:button", "Skip these packages")));
 #endif
diff --git a/rkward/rbackend/rksessionvars.cpp b/rkward/rbackend/rksessionvars.cpp
index 05b70ef0c..540f6b006 100644
--- a/rkward/rbackend/rksessionvars.cpp
+++ b/rkward/rbackend/rksessionvars.cpp
@@ -83,19 +83,11 @@ int RKSessionVars::compareRVersion (const QString& version) {
 QStringList RKSessionVars::frontendSessionInfo () {
 	QStringList lines;
 	lines.append ("RKWard version: " RKWARD_VERSION);
-	// KF5 TODO: find replacement for line below
-#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5,20,0)
 	lines.append ("KDE Frameworks version (runtime): " + QString (KCoreAddons::versionString ()));
-#endif
 	lines.append ("KDE Frameworks version (compile time): " KCOREADDONS_VERSION_STRING);
 	lines.append (QString ("Qt version (runtime): ") + qVersion ());
 	lines.append ("Qt version (compile time): " QT_VERSION_STR);
 	lines.append ("Using QWebEngine for HTML rendering");
-#if defined Q_OS_WIN
-	lines.append ("Windows runtime version (refer to QSysInfo documentation to translate code into human readable form): 0x" + QString::number (QSysInfo::windowsVersion (), 16));
-#elif defined Q_OS_MACOS
-	lines.append ("MacOS runtime version (refer to QSysInfo documentation to translate code into human readable form): 0x" + QString::number (QSysInfo::MacintoshVersion, 16));
-#endif
 	lines.append ("Local config directory: " + QStandardPaths::writableLocation (QStandardPaths::GenericConfigLocation));
 	lines.append ("RKWard storage directory: " + RKSettingsModuleGeneral::filesPath ());
 	lines.append ("Backend version (as known to the frontend): " + r_version_string);