summaryrefslogtreecommitdiffstats
path: root/khelpcenter/scrollkeepertreebuilder.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /khelpcenter/scrollkeepertreebuilder.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter/scrollkeepertreebuilder.cpp')
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 55bdfa689..0b830725e 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -54,7 +54,7 @@ void ScrollKeeperTreeBuilder::loadConfig()
NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
NavigatorItem *after )
{
- TQString lang = KGlobal::locale()->language();
+ TQString lang = TDEGlobal::locale()->language();
kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
@@ -62,7 +62,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
proc << "scrollkeeper-get-content-list";
proc << lang;
connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
- if (!proc.start(KProcess::Block)) {
+ if (!proc.start(TDEProcess::Block)) {
kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
return 0;
}