[education/rkward] rkward/rbackend: Clean up
Thomas Friedrichsmeier
null at kde.org
Sun Jul 17 20:12:11 BST 2022
Git commit 92bf15a90a84bd4b71c3b79be58d2c345a2aed4f by Thomas Friedrichsmeier.
Committed on 17/07/2022 at 19:11.
Pushed by tfry into branch 'master'.
Clean up
M +0 -24 rkward/rbackend/rkrinterface.cpp
https://invent.kde.org/education/rkward/commit/92bf15a90a84bd4b71c3b79be58d2c345a2aed4f
diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index f3fed9a2..711026db 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -53,16 +53,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QPushButton>
#include <QElapsedTimer>
-// TODO: remove these:
-#include <QLibraryInfo>
-#include <QStandardPaths>
-
// flush new pieces of output after this period of time:
#define FLUSH_INTERVAL 100
-#define STARTUP_PHASE2_COMPLETE 4
-#define RSTARTUP_COMPLETE 6
-
// statics
double RInterface::na_real;
int RInterface::na_int;
@@ -400,23 +393,6 @@ void RInterface::handleRequest (RBackendRequest* request) {
" fix(\"LD_LIBRARY_PATH\")\n"
" fix(\"PATH\")\n"
"})\n", RCommand::App | RCommand::Sync), chain, [](RCommand*) {});
-
- // TODO: Remove these. Temporary diagnostics regarding kioslave failure
- RK_DEBUG(RBACKEND, DL_INFO, "ldp: %s", qgetenv("LD_LIBRARY_PATH").data());
- RK_DEBUG(RBACKEND, DL_INFO, "p: %s", qgetenv("PATH").data());
- RK_DEBUG(RBACKEND, DL_INFO, "conf Prefix: %s", qPrintable(QLibraryInfo::location(QLibraryInfo::PrefixPath)));
- RK_DEBUG(RBACKEND, DL_INFO, "conf Lib: %s", qPrintable(QLibraryInfo::location(QLibraryInfo::LibrariesPath)));
- RK_DEBUG(RBACKEND, DL_INFO, "conf LibExec: %s", qPrintable(QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath)));
- RK_DEBUG(RBACKEND, DL_INFO, "conf Plugins: %s", qPrintable(QLibraryInfo::location(QLibraryInfo::PluginsPath)));
- const QString qlibexec = QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath);
- // on !win32 we use a kf5 suffix
- const QString qlibexecKF5 = QDir(qlibexec).filePath(QStringLiteral("kf5"));
- // search paths
- const QStringList searchPaths = QStringList() << QCoreApplication::applicationDirPath() // then look where our application binary is located
- << qlibexec << qlibexecKF5;
- RK_DEBUG(RBACKEND, DL_INFO, "search: %s", qPrintable(searchPaths.join("_:")));
- QString kioslaveExecutable = QStandardPaths::findExecutable(QStringLiteral("kioslave5"), searchPaths);
- RK_DEBUG(RBACKEND, DL_INFO, "kioslave: %s", qPrintable(kioslaveExecutable));
}
// find out about standard library locations
More information about the rkward-tracker
mailing list