[kde-doc-english] [kwin] /: rename kcmshell4 to kcmshell5

[Burkhard Lück]

Git commit 82b7804b0ab55ebf357513a8b8bd370858c068be by Burkhard L?ck.
Committed on 02/05/2014 at 15:24.
Pushed by lueck into branch 'master'.

rename kcmshell4 to kcmshell5

M  +1    -1    doc/windowspecific/index.docbook
M  +2    -2    scene_opengl.cpp

http://commits.kde.org/kwin/82b7804b0ab55ebf357513a8b8bd370858c068be

diff --git a/doc/windowspecific/index.docbook b/doc/windowspecific/index.docbook
index ea782b6..89717aa 100644
--- a/doc/windowspecific/index.docbook
+++ b/doc/windowspecific/index.docbook
@@ -477,7 +477,7 @@ and <guibutton>Move Down</guibutton> buttons effects on how 
they are applied.</p
   </varlistentry>
   <varlistentry><term><emphasis role="bold">Ignore global 
shortcuts</emphasis></term>
     <listitem>
-    <para>Toggle whether to ignore global shortcuts (as defined by 
<menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and 
Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> 
or by running <varname>kcmshell4 keys</varname> in 
<guilabel>konsole</guilabel>) while the window is active.</para>
+    <para>Toggle whether to ignore global shortcuts (as defined by 
<menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and 
Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> 
or by running <varname>kcmshell5 keys</varname> in 
<guilabel>konsole</guilabel>) while the window is active.</para>
      </listitem>
   </varlistentry>
   <varlistentry><term><emphasis role="bold">Closeable</emphasis></term>
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index c7bdbbb..86faeec 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);
     }