From 9f7eb66616ead765356c28e52c7c48dc548a3660 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 3 Apr 2022 15:02:25 +0300 Subject: [PATCH] libs: remove KDM leftovers Signed-off-by: Ivailo Monev --- libs/kdm/CMakeLists.txt | 3 --- libs/kworkspace/kdisplaymanager.cpp | 29 ----------------------------- libs/kworkspace/kdisplaymanager.h | 2 -- 3 files changed, 34 deletions(-) diff --git a/libs/kdm/CMakeLists.txt b/libs/kdm/CMakeLists.txt index 2ea1f120..957290c0 100644 --- a/libs/kdm/CMakeLists.txt +++ b/libs/kdm/CMakeLists.txt @@ -1,6 +1,3 @@ - -include_directories( ${CMAKE_SOURCE_DIR}/kdm/kfrontend ) - ########### next target ############### set(kgreet_classic_PART_SRCS kgreet_classic.cpp ) diff --git a/libs/kworkspace/kdisplaymanager.cpp b/libs/kworkspace/kdisplaymanager.cpp index 937d68c2..0fea669b 100644 --- a/libs/kworkspace/kdisplaymanager.cpp +++ b/libs/kworkspace/kdisplaymanager.cpp @@ -568,35 +568,6 @@ KDisplayManager::shutdown(KWorkSpace::ShutdownType shutdownType, } exec(cmd.data()); } - -bool -KDisplayManager::bootOptions(QStringList &opts, int &defopt, int ¤t) -{ - if (DMType != NewKDM) - return false; - - QByteArray re; - if (!exec("listbootoptions\n", re)) - return false; - - opts = QString::fromLocal8Bit(re.data()).split('\t', QString::SkipEmptyParts); - if (opts.size() < 4) - return false; - - bool ok; - defopt = opts[2].toInt(&ok); - if (!ok) - return false; - current = opts[3].toInt(&ok); - if (!ok) - return false; - - opts = opts[1].split(' ', QString::SkipEmptyParts); - for (QStringList::Iterator it = opts.begin(); it != opts.end(); ++it) - (*it).replace("\\s", " "); - - return true; -} #endif // KDM_NO_SHUTDOWN // This only tells KDM to not auto-re-login upon session crash diff --git a/libs/kworkspace/kdisplaymanager.h b/libs/kworkspace/kdisplaymanager.h index 76f25a77..4b1ed654 100644 --- a/libs/kworkspace/kdisplaymanager.h +++ b/libs/kworkspace/kdisplaymanager.h @@ -57,8 +57,6 @@ public: bool switchVT(int vt); void lockSwitchVT(int vt); - bool bootOptions(QStringList &opts, int &dflt, int &curr); - static QString sess2Str(const SessEnt &se); static void sess2Str2(const SessEnt &se, QString &user, QString &loc); -- 2.11.0