summaryrefslogtreecommitdiffstats
path: root/kcminit
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcminit
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcminit')
-rw-r--r--kcminit/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 507d648c9..92dd3409d 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.contains( libName.ascii() )) {
+ if (! alreadyInitialized.tqcontains( libName.ascii() )) {
if (!runModule(libName, service)) {
libName = TQString("libkcm_%1").arg(library);
- if (! alreadyInitialized.contains( libName.ascii() )) {
+ if (! alreadyInitialized.tqcontains( libName.ascii() )) {
runModule(libName, service);
alreadyInitialized.append( libName.ascii() );
}
@@ -159,7 +159,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
KService::Ptr serv = KService::serviceByStorageId( module );
if ( !serv || serv->library().isEmpty() ||
serv->init().isEmpty()) {
- kdError(1208) << i18n("Module %1 not found!").arg(module) << endl;
+ kdError(1208) << TQString(i18n("Module %1 not found!").arg(module)) << endl;
return;
} else
list.append(serv);
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
- TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
- qApp->exec(); // wait for runPhase1() and runPhase2()
+ TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
+ tqApp->exec(); // wait for runPhase1() and runPhase2()
}
else
runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
{
runModules( 2 );
emitDCOPSignal( "phase2Done()", TQByteArray());
- qApp->exit( 0 );
+ tqApp->exit( 0 );
}
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])