summaryrefslogtreecommitdiffstats
path: root/kcminit
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcminit
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcminit')
-rw-r--r--kcminit/main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 757c751d..507d648c 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
TQString libName = TQString("kcm_%1").arg(library);
// try to load the library
- if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+ if (! alreadyInitialized.contains( libName.ascii() )) {
if (!runModule(libName, service)) {
libName = TQString("libkcm_%1").arg(library);
- if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+ if (! alreadyInitialized.contains( libName.ascii() )) {
runModule(libName, service);
alreadyInitialized.append( libName.ascii() );
}
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
- TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
- tqApp->exec(); // wait for runPhase1() and runPhase2()
+ TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
+ qApp->exec(); // wait for runPhase1() and runPhase2()
}
else
runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
{
runModules( 2 );
emitDCOPSignal( "phase2Done()", TQByteArray());
- tqApp->exit( 0 );
+ qApp->exit( 0 );
}
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])