summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/dockbar
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/extensions/dockbar
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/dockbar')
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}