From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kicker/extensions/dockbar/dockbarextension.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kicker/extensions/dockbar') diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 63944e710..71160cbe6 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -46,7 +46,7 @@ extern "C" { KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("dockbarextension"); + TDEGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, 0, parent, "dockbarextension"); } @@ -316,9 +316,9 @@ void DockBarExtension::loadContainerConfig() DockContainer* c = new DockContainer(cmd, this, resName, resClass ); addContainer(c); - KProcess proc; + TDEProcess proc; proc << KShell::splitArgs( cmd ); - if (!proc.start(KProcess::DontCare)) { + if (!proc.start(TDEProcess::DontCare)) { fail_list.append(cmd); removeContainer(c); } -- cgit v1.2.1