diff --git a/filelight/src/part/radialMap/widgetEvents.cpp b/filelight/src/part/radialMap/widgetEvents.cpp
index 80e737b3..a5e150ac 100644
--- a/filelight/src/part/radialMap/widgetEvents.cpp
+++ b/filelight/src/part/radialMap/widgetEvents.cpp
@@ -241,7 +241,7 @@ void RadialMap::Widget::mousePressEvent(QMouseEvent *e)
             if (openFileManager && clicked == openFileManager) {
                 KRun::runUrl(url.url(),QLatin1String( "inode/directory" ), this);
             } else if (openTerminal && clicked == openTerminal) {
-                KToolInvocation::invokeTerminal(QString(),url.path());
+                KToolInvocation::self()->invokeTerminal(QString(), url.path());
             } else if (centerMap && clicked == centerMap) {
                 goto section_two;
             } else if (openFile && clicked == openFile) {
diff --git a/kdeplasma-addons/applets/konsoleprofiles/konsoleprofiles.cpp b/kdeplasma-addons/applets/konsoleprofiles/konsoleprofiles.cpp
index 1be2141d..6e189581 100644
--- a/kdeplasma-addons/applets/konsoleprofiles/konsoleprofiles.cpp
+++ b/kdeplasma-addons/applets/konsoleprofiles/konsoleprofiles.cpp
@@ -164,7 +164,7 @@ void KonsoleProfilesWidget::slotProfileClicked()
     const QStringList konsoleargs = QStringList()
         << "--profile" << profilename;
     QString invocationerror;
-    const int invocationresult = KToolInvocation::kdeinitExec("konsole", konsoleargs, &invocationerror);
+    const int invocationresult = KToolInvocation::self()->kdeinitExec("konsole", konsoleargs, &invocationerror);
     if (invocationresult != 0) {
         m_konsoleprofiles->showMessage(KIcon("dialog-error"), invocationerror, Plasma::ButtonOk);
     }
diff --git a/kdeplasma-addons/applets/timer/timer.cpp b/kdeplasma-addons/applets/timer/timer.cpp
index efe6c792..dbf239c0 100644
--- a/kdeplasma-addons/applets/timer/timer.cpp
+++ b/kdeplasma-addons/applets/timer/timer.cpp
@@ -367,7 +367,7 @@ void Timer::slotCountDone()
         QStringList args = KShell::splitArgs(m_command);
         QString command = args[0];
         args.removeFirst();
-        KToolInvocation::kdeinitExec(command, args);
+        KToolInvocation::self()->kdeinitExec(command, args);
     }
 }
 
diff --git a/kdeplasma-addons/runners/katesessions/katesessions.cpp b/kdeplasma-addons/runners/katesessions/katesessions.cpp
index 9b692c36..ff415eea 100644
--- a/kdeplasma-addons/runners/katesessions/katesessions.cpp
+++ b/kdeplasma-addons/runners/katesessions/katesessions.cpp
@@ -133,7 +133,7 @@ void KateSessions::run(const Plasma::QueryMatch &match)
     if (!session.isEmpty()) {
         QStringList args;
         args << QLatin1String("--start") << session << QLatin1String("-n");
-        KToolInvocation::kdeinitExec(QLatin1String("kate"), args);
+        KToolInvocation::self()->kdeinitExec(QLatin1String("kate"), args);
     }
 }
 
diff --git a/kdeplasma-addons/runners/konsolesessions/konsolesessions.cpp b/kdeplasma-addons/runners/konsolesessions/konsolesessions.cpp
index f4072b25..19102a6c 100644
--- a/kdeplasma-addons/runners/konsolesessions/konsolesessions.cpp
+++ b/kdeplasma-addons/runners/konsolesessions/konsolesessions.cpp
@@ -130,7 +130,7 @@ void KonsoleSessions::run(const Plasma::QueryMatch &match)
         args << QLatin1String( "--profile" );
         args << session;
         kDebug() << "=== START: konsole" << args;
-        KToolInvocation::kdeinitExec(QLatin1String("konsole"), args);
+        KToolInvocation::self()->kdeinitExec(QLatin1String("konsole"), args);
     }
 }
 
diff --git a/okular/core/document.cpp b/okular/core/document.cpp
index 2dda86aa..d029c24f 100644
--- a/okular/core/document.cpp
+++ b/okular/core/document.cpp
@@ -3487,7 +3487,7 @@ void Document::processAction( const Action * action )
             int lilyRow = 0, lilyCol = 0;
             // if the url is a mailto one, invoke mailer
             if ( browse->url().startsWith( "mailto:", Qt::CaseInsensitive ) )
-                KToolInvocation::invokeMailer( browse->url() );
+                KToolInvocation::self()->invokeMailer( browse->url() );
             else if ( extractLilyPondSourceReference( browse->url(), &lilySource, &lilyRow, &lilyCol ) )
             {
                 const SourceReference ref( lilySource, lilyRow, lilyCol );
diff --git a/okular/ui/pageview.cpp b/okular/ui/pageview.cpp
index af661db7..4088e951 100644
--- a/okular/ui/pageview.cpp
+++ b/okular/ui/pageview.cpp
@@ -4378,14 +4378,14 @@ void PageView::slotHandleWebShortcutAction()
 
         if ( KUriFilter::self()->filterSearchUri( filterData, KUriFilter::WebShortcutFilter ) )
         {
-            KToolInvocation::invokeBrowser( filterData.uri().url() );
+            KToolInvocation::self()->invokeBrowser( filterData.uri().url() );
         }
     }
 }
 
 void PageView::slotConfigureWebShortcuts()
 {
-    KToolInvocation::kdeinitExec( "kcmshell4", QStringList() << "ebrowsing" );
+    KToolInvocation::self()->kdeinitExec( "kcmshell4", QStringList() << "ebrowsing" );
 }
 
 void PageView::slotZoom()