diff options
Diffstat (limited to 'kcontrol/xinerama')
| -rw-r--r-- | kcontrol/xinerama/kcmxinerama.cpp | 26 | ||||
| -rw-r--r-- | kcontrol/xinerama/xineramawidget.ui | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index f5d74a191..32380a591 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -59,7 +59,7 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) config = new TDEConfig("kdeglobals", false, false); ksplashrc = new TDEConfig("ksplashrc", false, false); - connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator())); + connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearIndicator())); TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); @@ -91,14 +91,14 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) xw->headTable->setRowLabels(dpyList); - connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(windowIndicator(int))); - connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(windowIndicator(int))); - connect(xw->_identify, TQT_SIGNAL(clicked()), - this, TQT_SLOT(indicateWindows())); + connect(xw->_ksplashDisplay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(windowIndicator(int))); + connect(xw->_unmanagedDisplay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(windowIndicator(int))); + connect(xw->_identify, TQ_SIGNAL(clicked()), + this, TQ_SLOT(indicateWindows())); - connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed())); + connect(xw, TQ_SIGNAL(configChanged()), this, TQ_SLOT(changed())); } else { // no Xinerama TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this); grid->addWidget(ql, 0, 0); @@ -175,9 +175,9 @@ void KCMXinerama::save() { config->writeEntry("Unmanaged", item == _displays ? -3 : item); config->sync(); - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send("twin", "", "reconfigure()", TQString("")); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send("twin", "", "reconfigure()", TQString("")); ksplashrc->setGroup("Xinerama"); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); @@ -239,12 +239,12 @@ void KCMXinerama::clearIndicator() { } extern "C" { - KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) { + TDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } - KDE_EXPORT bool test_xinerama() { + TDE_EXPORT bool test_xinerama() { return TQApplication::desktop()->isVirtualDesktop(); } } diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index a5e3664de..a999d68a3 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -315,12 +315,12 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">xineramawidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>configChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">emitConfigChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> |