diff options
Diffstat (limited to 'tdecmshell/main.cpp')
| -rw-r--r-- | tdecmshell/main.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index a99c4b545..e4171e233 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -79,7 +79,7 @@ static void listModules(const TQString &baseGroup) if (p->isType(KST_KService)) { KService *s = static_cast<KService*>(p); - if (!kapp->authorizeControlModule(s->menuId())) + if (!tdeApp->authorizeControlModule(s->menuId())) continue; m_modules.append(s); } @@ -128,7 +128,7 @@ bool KCMShell::isRunning() TQByteArray data; TQDataStream str( data, IO_WriteOnly ); - str << kapp->startupId(); + str << tdeApp->startupId(); TQCString replyType; TQByteArray replyData; if (!dcopClient()->call(m_dcopName, "dialog", "activate(TQCString)", @@ -170,8 +170,8 @@ void KCMShell::waitForExit() { kdDebug(780) << k_funcinfo << endl; - connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT( appExit(const TQCString&) )); + connect(dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT( appExit(const TQCString&) )); exec(); } @@ -191,12 +191,12 @@ static void setIcon(TQWidget *w, const TQString &iconName) TQPixmap icon = DesktopIcon(iconName); TQPixmap miniIcon = SmallIcon(iconName); w->setIcon( icon ); //standard X11 -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY KWin::setIcons(w->winId(), icon, miniIcon ); #endif } -extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) +extern "C" TDE_EXPORT int kdemain(int _argc, char *_argv[]) { TDEAboutData aboutData( "tdecmshell", I18N_NOOP("TDE Control Module"), 0, @@ -313,7 +313,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) } KCMShellMultiDialog *dlg = new KCMShellMultiDialog( dtype, - i18n("Configure - %1").arg(kapp->caption()), 0, "", true ); + i18n("Configure - %1").arg(tdeApp->caption()), 0, "", true ); for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it) dlg->addModule(TDECModuleInfo(*it)); @@ -334,8 +334,8 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) else { - if (kapp->iconName() != kapp->name()) - setIcon(dlg, kapp->iconName()); + if (tdeApp->iconName() != tdeApp->name()) + setIcon(dlg, tdeApp->iconName()); else if ( modules.count() == 1 ) setIcon(dlg, TDECModuleInfo( modules.first()).icon()); @@ -345,4 +345,3 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) return 0; } -// vim: sw=4 et sts=4 |