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 --- khelpcenter/scrollkeepertreebuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khelpcenter/scrollkeepertreebuilder.cpp') 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; } -- cgit v1.2.3