From b048083425aac041ebf0c3c6b28353dab0e79439 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 3 Oct 2022 15:46:52 +0300 Subject: [PATCH] kinfocenter: use KToolInvocation::invokeHelp() instead of attempting to start khelpcenter khelpcenter is no longer maintained Signed-off-by: Ivailo Monev --- kinfocenter/infocenter.cpp | 6 +----- kinfocenter/kcmcontainer.cpp | 4 ++-- kinfocenter/kcmcontainer.h | 6 ++---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/kinfocenter/infocenter.cpp b/kinfocenter/infocenter.cpp index b46e6580..26a5167a 100644 --- a/kinfocenter/infocenter.cpp +++ b/kinfocenter/infocenter.cpp @@ -234,11 +234,7 @@ void KInfoCenter::resetCondition() void KInfoCenter::helpClickedSlot() { - // Nicked from Ben, could not use KToolInvocation due to docpath. - QString docPath = m_contain->helpPath(); - - KUrl url( KUrl("help:/"), docPath ); - QProcess::startDetached("khelpcenter", QStringList() << url.url()); + KToolInvocation::invokeHelp(QString(), m_contain->serviceName()); } void KInfoCenter::exportClickedSlot() diff --git a/kinfocenter/kcmcontainer.cpp b/kinfocenter/kcmcontainer.cpp index 8e0dc353..e668241f 100644 --- a/kinfocenter/kcmcontainer.cpp +++ b/kinfocenter/kcmcontainer.cpp @@ -117,10 +117,10 @@ void KcmContainer::setKcmTitle(const KCModuleInfo &info) m_titleLabel->setText(i18n("%1 ( %2 )",kcmTitle,kcmComment)); } -QString KcmContainer::helpPath() const +QString KcmContainer::serviceName() const { if(m_mod == NULL) return QString(); - return m_modInfo.docPath(); + return m_modInfo.fileName().replace(QLatin1String(".desktop"), QString()); } KCModule::Buttons KcmContainer::buttons() const diff --git a/kinfocenter/kcmcontainer.h b/kinfocenter/kcmcontainer.h index 21289c70..f1f62973 100644 --- a/kinfocenter/kcmcontainer.h +++ b/kinfocenter/kcmcontainer.h @@ -65,11 +65,9 @@ class KcmContainer : public QScrollArea void setKcmTopEdge(int y); /** - * Get currently selected KCMs document path - * for .desktop - * X-KDE-DocPath + * Get currently selected KCMs service name */ - QString helpPath() const; + QString serviceName() const; /** * Get currently selected KCMs