From 82b7804b0ab55ebf357513a8b8bd370858c068be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burkhard=20L=C3=BCck?= Date: Fri, 2 May 2014 17:24:47 +0200 Subject: [PATCH] rename kcmshell4 to kcmshell5 --- doc/windowspecific/index.docbook | 2 +- scene_opengl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/windowspecific/index.docbook b/doc/windowspecific/index.docbook index ea782b6a67..89717aa208 100644 --- a/doc/windowspecific/index.docbook +++ b/doc/windowspecific/index.docbook @@ -477,7 +477,7 @@ and Move Down buttons effects on how they are applied.

Ignore global shortcuts - Toggle whether to ignore global shortcuts (as defined by System SettingsShortcuts and GesturesGlobal Shortcuts or by running kcmshell4 keys in konsole) while the window is active. + Toggle whether to ignore global shortcuts (as defined by System SettingsShortcuts and GesturesGlobal Shortcuts or by running kcmshell5 keys in konsole) while the window is active. Closeable diff --git a/scene_opengl.cpp b/scene_opengl.cpp index c7bdbbbcec..86faeec5e3 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -510,7 +510,7 @@ bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const { dialog.asyncCall(QStringLiteral("warn"), message, details, QString()); } else { const QString args = QStringLiteral("warn ") + QString::fromUtf8(message.toLocal8Bit().toBase64()) + QStringLiteral(" details ") + QString::fromUtf8(details.toLocal8Bit().toBase64()); - KProcess::startDetached(QStringLiteral("kcmshell4"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args); + KProcess::startDetached(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args); } QDBusConnection::sessionBus().interface()->setTimeout(oldTimeout); return false; @@ -542,7 +542,7 @@ bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const { } else { const QString args = QStringLiteral("warn ") + QString::fromUtf8(message.toLocal8Bit().toBase64()) + QStringLiteral(" details ") + QString::fromUtf8(details.toLocal8Bit().toBase64()) + QStringLiteral(" dontagain kwin_dialogsrc:max_tex_warning"); - KProcess::startDetached(QStringLiteral("kcmshell4"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args); + KProcess::startDetached(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args); } QDBusConnection::sessionBus().interface()->setTimeout(oldTimeout); }