diff options
Diffstat (limited to 'kcontrol')
514 files changed, 6717 insertions, 3879 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 5e506470c..874df3b67 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -92,14 +92,14 @@ static ModifierKey modifierKeys[] = { KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) - : KUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), + : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), overlay(0), wm(0, KWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); - connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId))); + connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId))); artsBellTimer = new TQTimer( this ); - connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() )); + connect( artsBellTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotArtsBellTimeout() )); features = 0; requestedFeatures = 0; @@ -132,7 +132,7 @@ void KAccessApp::readSettings() _artsBellFile = config->readPathEntry("ArtsBellFile"); _visibleBell = config->readBoolEntry("VisibleBell", false); _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false); - TQColor def(Qt::red); + TQColor def(TQt::red); _visibleBellColor = config->readColorEntry("VisibleBellColor", &def); _visibleBellPause = config->readNumEntry("VisibleBellPause", 500); @@ -364,7 +364,7 @@ bool KAccessApp::x11EventFilter(XEvent *event) void VisualBell::paintEvent(TQPaintEvent *event) { TQWidget::paintEvent(event); - TQTimer::singleShot(_pause, this, TQT_SLOT(hide())); + TQTimer::singleShot(_pause, this, TQ_SLOT(hide())); } @@ -574,12 +574,12 @@ void KAccessApp::createDialogContents() { lay->setSpacing(KDialog::spacingHint()); TQLabel *label1 = new TQLabel( contents); - TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); if (pixmap.isNull()) pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); label1->setPixmap(pixmap); - lay->addWidget( label1, 0, Qt::AlignCenter ); + lay->addWidget( label1, 0, TQt::AlignCenter ); lay->addSpacing(KDialog::spacingHint()); TQVBoxLayout * vlay = new TQVBoxLayout(lay); @@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() { dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); - connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked())); - connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked())); - connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed())); + connect (dialog, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(yesClicked())); + connect (dialog, TQ_SIGNAL(noClicked()), this, TQ_SLOT(noClicked())); + connect (dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(dialogClosed())); } } @@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") ); KWin::setState( dialog->winId(), NET::KeepAbove ); - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); dialog->show(); } } diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index 95d8b2559..0bb22f8e7 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -6,7 +6,7 @@ #include <tqcolor.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twinmodule.h> @@ -19,9 +19,9 @@ class KDialogBase; class TQLabel; class KComboBox; -class KAccessApp : public KUniqueApplication +class KAccessApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: @@ -88,7 +88,7 @@ private: class VisualBell : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index ccdb74f81..b7e20d27b 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcolorbutton.h> #include <tdefiledialog.h> #include <tdeapplication.h> @@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { KIntNumInput::setRange (min,max,step, slider); if (slider) { - disconnect(m_slider, TQT_SIGNAL(valueChanged(int)), - m_spin, TQT_SLOT(setValue(int))); - disconnect(m_spin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(spinValueChanged(int))); + disconnect(m_slider, TQ_SIGNAL(valueChanged(int)), + m_spin, TQ_SLOT(setValue(int))); + disconnect(m_spin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(spinValueChanged(int))); this->min = min; this->max = max; @@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { double logVal = alpha * (log((double)value())-log((double)min)); m_slider->setValue ((int)floor (0.5 + logVal)); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderValueChanged(int))); - connect(m_spin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSpinValueChanged(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderValueChanged(int))); + connect(m_spin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSpinValueChanged(int))); } } @@ -245,7 +245,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) KDialogBase::spacingHint()); TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(), @@ -276,19 +276,19 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) TQWhatsThis::add( soundLabel, wtstr ); TQWhatsThis::add( soundButton, wtstr ); - connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound())); + connect(soundButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectSound())); - connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(systemBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(soundEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); // ----------------------------------------------------- // visible bell ---------------------------------------- grp = new TQGroupBox(i18n("Visible Bell"), bell); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -320,22 +320,22 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); durationSlider = new ExtendedIntNumInput(grp); - durationSlider->setRange(100, 2000, 100); + durationSlider->setRange(10, 2000, 10); durationSlider->setLabel(i18n("Duration:")); durationSlider->setSuffix(i18n(" msec")); hbox->addWidget(durationSlider); TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); - connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor())); + connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(colorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFlashScreenColor())); - connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked())); - connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked())); + connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertClicked())); + connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(flashClicked())); - connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(durationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); vbox->addStretch(); @@ -350,7 +350,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint()); grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -374,7 +374,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addWidget(stickyKeysBeep); grp = new TQGroupBox(i18n("Locking Keys"), modifiers); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -391,16 +391,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); - connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeysLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeysAutoOff, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); + connect(stickyKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(toggleKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(kNotifyModifiersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify())); vbox->addStretch(); @@ -412,7 +412,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint()); grp = new TQGroupBox(i18n("Slo&w Keys"), filters); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -424,7 +424,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); slowKeysDelay = new ExtendedIntNumInput(grp); slowKeysDelay->setSuffix(i18n(" msec")); - slowKeysDelay->setRange(50, 10000, 100); + slowKeysDelay->setRange(10, 10000, 10); slowKeysDelay->setLabel(i18n("Acceptance dela&y:")); hbox->addWidget(slowKeysDelay); @@ -444,7 +444,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addWidget(slowKeysRejectBeep); grp = new TQGroupBox(i18n("Bounce Keys"), filters); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -456,7 +456,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); bounceKeysDelay = new ExtendedIntNumInput(grp); bounceKeysDelay->setSuffix(i18n(" msec")); - bounceKeysDelay->setRange(100, 5000, 100); + bounceKeysDelay->setRange(10, 5000, 10); bounceKeysDelay->setLabel(i18n("D&ebounce time:")); hbox->addWidget(bounceKeysDelay); @@ -465,18 +465,18 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); hbox->addWidget(bounceKeysRejectBeep); - connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(slowKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysPressBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeysAcceptBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); - connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(bounceKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(bounceKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); vbox->addStretch(); @@ -488,7 +488,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint()); grp = new TQGroupBox(i18n("Activation Gestures"), features); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -513,12 +513,12 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); timeoutDelay = new KIntNumInput(grp); timeoutDelay->setSuffix(i18n(" min")); - timeoutDelay->setRange(1, 30, 4); + timeoutDelay->setRange(1, 30, 1); timeoutDelay->setLabel(i18n("Timeout:")); hbox->addWidget(timeoutDelay); grp = new TQGroupBox(i18n("Notification"), features); - grp->setColumnLayout( 0, Qt::Horizontal ); + grp->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(grp); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); @@ -539,15 +539,15 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); - connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); + connect(gestures, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(timeoutDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(accessxBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(gestureConfirmation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(kNotifyAccessXButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify())); vbox->addStretch(); @@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults ) visibleBell->setChecked(config->readBoolEntry("VisibleBell", false)); invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true)); flashScreen->setChecked(!invertScreen->isChecked()); - TQColor def(Qt::red); + TQColor def(TQt::red); colorButton->setColor(config->readColorEntry("VisibleBellColor", &def)); durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500)); @@ -717,7 +717,7 @@ void KAccessConfig::save() // When turning things off, it needs to be done by kaccess, // so don't actually kill it *shrug*. if ( true /*needToRunKAccessDaemon( config )*/ ) - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); else // don't need it -> kill it { @@ -799,7 +799,7 @@ void KAccessConfig::checkAccess() extern "C" { - KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name) { return new KAccessConfig(parent, name); } @@ -807,14 +807,14 @@ extern "C" /* This one gets called by kcminit */ - KDE_EXPORT void init_access() + TDE_EXPORT void init_access() { TDEConfig *config = new TDEConfig("kaccessrc", true, false); bool run = needToRunKAccessDaemon( config ); delete config; if (run) - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); } } diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index 4eb8af45d..1f59badbc 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -26,7 +26,7 @@ class TDEAboutData; class ExtendedIntNumInput : public KIntNumInput { - Q_OBJECT + TQ_OBJECT public: /** @@ -59,7 +59,7 @@ class ExtendedIntNumInput : public KIntNumInput class KAccessConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index aede70579..11aedc50b 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -4,7 +4,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> -extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) +extern "C" TDE_EXPORT int kdemain(int argc, char * argv[] ) { TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), 0, 0, TDEAboutData::License_GPL, diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 388776bc1..0e63f876f 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -43,19 +43,19 @@ #include <kdialog.h> #include <klineedit.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krichtextlabel.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <libtdemid/deviceman.h> #include "arts.h" extern "C" { - KDE_EXPORT void init_arts(); + TDE_EXPORT void init_arts(); - KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/) { TDEGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); @@ -74,7 +74,7 @@ static bool startArts() delete config; if (startServer) - kapp->tdeinitExec(startRealtime?"artswrapper":"artsd", + tdeApp->tdeinitExec(startRealtime?"artswrapper":"artsd", TQStringList::split(" ",args)); return startServer; } @@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList() *artsd << "artsd"; *artsd << "-A"; - connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotArtsdExited(TDEProcess*))); - connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int))); + connect(artsd, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotArtsdExited(TDEProcess*))); + connect(artsd, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int))); if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) { KMessageBox::error(0, i18n("Unable to start the sound server to " @@ -216,31 +216,31 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) suspendTime->setRange( 1, 999, 1, true ); - connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged())); -// connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) ); - - connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); - connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); - connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); - connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged())); - connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); - connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); - connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); - connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); - connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); - connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound())); - connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotChanged() ) ); + connect(startServer,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(networkTransparent,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(startRealtime,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(fullDuplex,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(customDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(deviceName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(customRate, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(samplingRate, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SLOT(slotChanged())); +// connect(general->volumeSystray, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged()) ); + + connect(hardware->audioIO,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged())); + connect(hardware->audioIO,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged())); + connect(hardware->customOptions,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged())); + connect(hardware->addOptions,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotChanged())); + connect(hardware->soundQuality,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged())); + connect(hardware->soundQuality,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged())); + connect(general->latencySlider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged())); + connect(autoSuspend,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged())); + connect(suspendTime,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged())); + connect(general->testSound,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestSound())); + connect(hardware->midiDevice, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiDevice, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiUseMapper, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiMapper, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotChanged() ) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmarts"), I18N_NOOP("The Sound Server Control Module"), @@ -553,8 +553,8 @@ bool KArtsModule::realtimeIsPossible() *checkProcess << "artswrapper"; *checkProcess << "check"; - connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotArtsdExited(TDEProcess*))); + connect(checkProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotArtsdExited(TDEProcess*))); if (!checkProcess->start(TDEProcess::Block)) { delete checkProcess; @@ -600,7 +600,7 @@ void KArtsModule::restartServer() } // Restart knotify - kapp->startServiceByDesktopName("knotify"); + tdeApp->startServiceByDesktopName("knotify"); } bool KArtsModule::artsdIsRunning() @@ -672,7 +672,7 @@ KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const ch const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -718,7 +718,7 @@ KStartArtsProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 5eebd4ba1..97b834d47 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -48,7 +48,7 @@ class DeviceManager; class KArtsModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -118,7 +118,7 @@ private: class KStartArtsProgressDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: KStartArtsProgressDialog(KArtsModule *parent, const char *name, const TQString &caption, const TQString &text); diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 18cba5a32..28f15cf99 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -33,7 +33,7 @@ * QLabel */ class TDEUI_EXPORT KRichTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kcontrol/background/KCrossBGRender.cpp b/kcontrol/background/KCrossBGRender.cpp index 489e98d1b..8f91a904d 100644 --- a/kcontrol/background/KCrossBGRender.cpp +++ b/kcontrol/background/KCrossBGRender.cpp @@ -149,7 +149,7 @@ bool KCrossBGRender::needWallpaperChange(){ } /* - * This method change the enabledEffect flag to TRUE of FALSE, according + * This method change the enabledEffect flag to true of false, according * with multiWallpaperMode and FileName (it needs to be a XML) */ void KCrossBGRender::fixEnabled(){ diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 2a80db02d..2d5db7b8f 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -37,7 +37,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include "bgrender.h" @@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 ); dlg->m_listPrograms->setAllColumnsShowFocus(true); - connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemClicked(TQListViewItem *))); // Load programs TQStringList lst = KBackgroundProgram::list(); @@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_spinCache->setSpecialValueText(i18n("Unlimited")); dlg->m_spinCache->setSuffix(i18n(" KB")); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemove())); - connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()), - TQT_SLOT(slotModify())); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemove())); + connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()), + TQ_SLOT(slotModify())); - connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); } else { @@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_groupCache->hide(); } - connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEnableProgram(bool))); + connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEnableProgram(bool))); m_backgroundMode = m_oldBackgroundMode = r->backgroundMode(); if (m_oldBackgroundMode == KBackgroundSettings::Program) @@ -175,7 +175,7 @@ void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color) else { dlg->m_cbSolidTextBackground->setChecked(false); - dlg->m_colorTextBackground->setColor(Qt::white); + dlg->m_colorTextBackground->setColor(TQt::white); dlg->m_colorTextBackground->setEnabled(false); } dlg->m_colorTextBackground->blockSignals(false); @@ -434,7 +434,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent m_RefreshEdit->setSuffix(i18n(" min")); m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint()); lbl->setBuddy(m_RefreshEdit); - grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft); + grid->addWidget(m_RefreshEdit, 5, 1, TQt::AlignLeft); m_Program = program; if (m_Program.isEmpty()) { diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h index 15fcae5fd..71dfa61ac 100644 --- a/kcontrol/background/bgadvanced.h +++ b/kcontrol/background/bgadvanced.h @@ -38,7 +38,7 @@ class KBackgroundProgram; class BGAdvancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop); @@ -95,7 +95,7 @@ private: */ class KProgramEditDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L, diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 67756d466..79686182e 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -47,7 +47,7 @@ #include <kimageio.h> #include <tdelocale.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurlrequester.h> #include <twin.h> @@ -73,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_previewUpdates = true; KWinModule *m_twin; - m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_twin = new KWinModule(this); m_curDesk = m_twin->currentDesktop(); TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; @@ -122,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_eScreen = 0; } - connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens())); + connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens())); // preview monitor m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement"); - connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &))); + connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &))); if( m_multidesktop) { // desktop - connect(m_comboDesktop, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectDesk(int))); + connect(m_comboDesktop, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectDesk(int))); } if (m_numScreens > 1) { - connect(m_comboScreen, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectScreen(int))); + connect(m_comboScreen, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectScreen(int))); } // background image settings @@ -146,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); - connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotWallpaperTypeChanged(int))); - connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaper(int))); - connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotWallpaperSelection())); - connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaperPos(int))); - connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSetupMulti())); + connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotWallpaperTypeChanged(int))); + connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaper(int))); + connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotWallpaperSelection())); + connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaperPos(int))); + connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSetupMulti())); // set up the background colour stuff - connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotPrimaryColor(const TQColor &))); - connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotSecondaryColor(const TQColor &))); - connect(m_comboPattern, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotPattern(int))); + connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotPrimaryColor(const TQColor &))); + connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotSecondaryColor(const TQColor &))); + connect(m_comboPattern, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotPattern(int))); // blend - connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int))); - connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotBlendBalance(int))); - connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotBlendReverse(bool))); + connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int))); + connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotBlendBalance(int))); + connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotBlendReverse(bool))); // Crossfading background - connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotCrossFadeBg(bool))); + connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotCrossFadeBg(bool))); // advanced options - connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdvanced())); + connect(m_buttonAdvanced, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdvanced())); - connect(m_buttonGetNew, TQT_SIGNAL(clicked()), - TQT_SLOT(slotGetNewStuff())); + connect(m_buttonGetNew, TQ_SIGNAL(clicked()), + TQ_SLOT(slotGetNewStuff())); // renderers m_renderer.resize(m_numDesks+1); @@ -198,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // Setup the merged-screen renderer KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); m_renderer[i].insert( 0, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the common-screen renderer r = new KBackgroundRenderer(eDesk, 0, true, _config); m_renderer[i].insert( 1, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the remaining renderers for each screen for (unsigned j=0; j < m_numScreens; ++j ) { r = new KBackgroundRenderer(eDesk, j, true, _config); m_renderer[i].insert( j+2, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); } } } @@ -225,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // set up the common desktop renderer KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); m_renderer[0].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); // set up all the other desktop renderers for (unsigned i = 0; i < m_numDesks; ++i) { r = new KBackgroundRenderer(i, 0, false, _config); m_renderer[i+1].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); } } @@ -285,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) updateUI(); #if (TQT_VERSION-0 >= 0x030200) - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif } @@ -443,11 +443,11 @@ void BGDialog::slotIdentifyScreens() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->setAlignment(TQt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); @@ -528,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() { // Wallpapers // the following TQMap is lower cased names mapped to cased names and URLs // this way we get case insensitive sorting - TQMap<TQString, QPair<TQString, TQString> > papers; + TQMap<TQString, TQPair<TQString, TQString> > papers; //search for .desktop files before searching for images without .desktop files TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); @@ -536,7 +536,7 @@ void BGDialog::loadWallpaperFilesList() { TQStringList hiddenfiles; for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { - KSimpleConfig fileConfig(*it); + TDESimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); int slash = (*it).findRev('/') + 1; @@ -620,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() { comboWallpaper->clear(); m_wallpaper.clear(); int i = 0; - for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin(); + for (TQMap<TQString, TQPair<TQString, TQString> >::Iterator it = papers.begin(); it != papers.end(); ++it) { diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 607118337..a2e7bfea6 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -34,7 +34,7 @@ class TDEStandardDirs; class BGDialog : public BGDialog_UI { - Q_OBJECT + TQ_OBJECT public: BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true); ~BGDialog(); diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 1cf601bee..ac826a1ff 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <tqapplication.h> #include <tqpixmap.h> @@ -47,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name) BGMonitorLabel * label = new BGMonitorLabel(this); m_pBGMonitor[screen] = label; - connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) ); + connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) ); } parent->setFixedSize(200, 186); diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h index 5d2e1fc45..95608261b 100644 --- a/kcontrol/background/bgmonitor.h +++ b/kcontrol/background/bgmonitor.h @@ -38,7 +38,7 @@ class KPixmap; */ class BGMonitorArrangement : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BGMonitorArrangement(TQWidget *parent, const char *name=0L); @@ -94,7 +94,7 @@ protected: */ class BGMonitor : public TQLabel { - Q_OBJECT + TQ_OBJECT public: BGMonitor(TQWidget *parent, const char *name=0L); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index e6c8fcccd..522065711 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -24,9 +24,9 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kimageeffect.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpixmapio.h> #include <tdetempfile.h> #include <kcursor.h> @@ -63,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_TilingEnabled = false; m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render())); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render())); } @@ -239,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotBackgroundDone(TDEProcess *))); + connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotBackgroundDone(TDEProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; @@ -384,7 +384,7 @@ wp_load: wpmode = NoWallpaper; goto wp_out; } - m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither); + m_Wallpaper = m_Wallpaper.convertDepth(32, TQt::DiffuseAlphaDither); // If we're previewing, scale the wallpaper down to make the preview // look more like the real desktop. @@ -402,7 +402,7 @@ wp_load: // HACK: Use KFileMetaInfo only when we're attached to DCOP. // KFileMetaInfo needs tdesycoca and so on, but this code is // used also in krootimage (which in turn is used by tdm). - if( kapp->dcopClient()->isAttached()) { + if( tdeApp->dcopClient()->isAttached()) { KFileMetaInfo metaInfo(file); if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) { switch (metaInfo.item("Orientation").string().toInt()) { @@ -628,7 +628,7 @@ void KBackgroundRenderer::fullWallpaperBlend() m_Image = m_Background.copy(); if (m_Image.depth() < 32) - m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither); + m_Image = m_Image.convertDepth(32, TQt::DiffuseAlphaDither); } else { m_Image.create(w, h, 32); @@ -1160,7 +1160,7 @@ void KVirtualBGRenderer::desktopResized() { delete m_pPixmap; m_pPixmap = new TQPixmap(m_size); - m_pPixmap->fill(Qt::black); + m_pPixmap->fill(TQt::black); } initRenderers(); @@ -1228,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers() KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig); m_renderer.insert( i, r ); r->setSize(renderSize(i)); - connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) ); } } @@ -1317,7 +1317,7 @@ void KVirtualBGRenderer::start() // If are screen sizes do not properly tile the overall virtual screen // size, then we want the untiled parts to be black for use in desktop // previews, etc - m_pPixmap->fill(Qt::black); + m_pPixmap->fill(TQt::black); } m_bFinished.fill(false); diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index 56ce3076a..f9042dd56 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -39,7 +39,7 @@ class KBackgroundRenderer: public TQObject, public KBackgroundSettings { - Q_OBJECT + TQ_OBJECT public: KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0); @@ -120,9 +120,9 @@ private: * images. Usage is similar to KBackgroundRenderer: connect to the imageDone * signal. */ -class KVirtualBGRenderer : public QObject +class KVirtualBGRenderer : public TQObject { - Q_OBJECT + TQ_OBJECT public: KVirtualBGRenderer(int desk, TDEConfig *config=0l); ~KVirtualBGRenderer(); diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 278a250c9..2f41cb4c0 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeglobalsettings.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <krandomsequence.h> #include <konq_defaults.h> @@ -84,9 +84,9 @@ void KBackgroundPattern::init(bool force_rw) m_File = m_pDirs->findResource("dtop_pattern", m_Name + ".desktop"); if (force_rw || m_File.isEmpty()) { m_File = m_pDirs->saveLocation("dtop_pattern") + m_Name + ".desktop"; - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); } else - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_pConfig->setGroup("KDE Desktop Pattern"); @@ -251,10 +251,10 @@ void KBackgroundProgram::init(bool force_rw) m_File = m_pDirs->findResource("dtop_program", m_Name + ".desktop"); if (force_rw || m_File.isEmpty()) { m_File = m_pDirs->saveLocation("dtop_program") + m_Name + ".desktop"; - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_bReadOnly = false; } else { - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_bReadOnly = (m_File != locateLocal("dtop_program", m_Name + ".desktop")); } m_pConfig->setGroup("KDE Desktop Program"); @@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings() // tell kdesktop to get it's butt in gear and pick up the new settings TQByteArray data; - kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); + tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); } diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index 348446c82..40b2c68d8 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -17,7 +17,7 @@ template <class TQString, class T> class TQMap; class TDEStandardDirs; -class KSimpleConfig; +class TDESimpleConfig; class TDEConfig; class TQString; class TQImage; @@ -66,7 +66,7 @@ private: TQString m_Name, m_Comment; TQString m_Pattern, m_File; TDEStandardDirs *m_pDirs; - KSimpleConfig *m_pConfig; + TDESimpleConfig *m_pConfig; }; @@ -137,7 +137,7 @@ private: TQString m_PreviewCommand, m_Comment; TQString m_Executable, m_File; TDEStandardDirs *m_pDirs; - KSimpleConfig *m_pConfig; + TDESimpleConfig *m_pConfig; }; diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index b10c3707b..f75151247 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -30,7 +30,7 @@ #include <tdefiledialog.h> #include <kimageio.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include "bgsettings.h" @@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random) dlg->m_cbRandom->setChecked(true); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *))); dlg->m_buttonRemove->setEnabled( false ); dlg->m_buttonMoveUp->setEnabled( false ); dlg->m_buttonMoveDown->setEnabled( false ); diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h index 32f0784fc..6a61516ee 100644 --- a/kcontrol/background/bgwallpaper.h +++ b/kcontrol/background/bgwallpaper.h @@ -44,7 +44,7 @@ public: class BGMultiWallpaperDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 75ed22269..23478b5e1 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList // reparenting that is done. setAcceptDrops(true); - connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"), @@ -100,7 +100,7 @@ void KBackground::save() m_base->save(); // reconfigure kdesktop. kdesktop will notify all clients - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h index 79e72d5a3..d4442b340 100644 --- a/kcontrol/background/main.h +++ b/kcontrol/background/main.h @@ -20,7 +20,7 @@ class BGDialog; */ class KBackground: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KBackground(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 5022ab420..b2ff888b4 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -40,17 +40,17 @@ extern "C" { - KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *) { return new KBellConfig(parent, "kcmbell"); } - KDE_EXPORT void init_bell() + TDE_EXPORT void init_bell() { XKeyboardState kbd; XKeyboardControl kbdc; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); TDEConfig config("kcmbellrc", true, false); config.setGroup("General"); @@ -58,7 +58,7 @@ extern "C" kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent); kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch); kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration); - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbdc); } @@ -71,7 +71,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): int row = 0; TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this ); - box->setColumnLayout( 0, Qt::Horizontal ); + box->setColumnLayout( 0, TQt::Horizontal ); layout->addWidget(box); layout->addStretch(); TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); @@ -84,7 +84,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): "more sophisticated system notification, see the " "\"System Notifications\" control module for the " "\"Something Special Happened in the Program\" event.")); - connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool ))); + connect(m_useBell, TQ_SIGNAL( toggled( bool )), TQ_SLOT( useBell( bool ))); row++; grid->addMultiCellWidget(m_useBell, row, row, 0, 1); @@ -124,13 +124,13 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): m_testButton = new TQPushButton(i18n("&Test"), box, "test"); boxLayout->addWidget(m_testButton, 0, AlignRight); grid->addLayout( boxLayout, ++row, 1 ); - connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell())); + connect( m_testButton, TQ_SIGNAL(clicked()), TQ_SLOT(ringBell())); TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); // watch for changes - connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_volume, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_pitch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_duration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"), @@ -154,7 +154,7 @@ void KBellConfig::load() void KBellConfig::load( bool useDefaults ) { XKeyboardState kbd; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); m_volume->setValue(kbd.bell_percent); m_pitch->setValue(kbd.bell_pitch); @@ -179,7 +179,7 @@ void KBellConfig::save() kbd.bell_percent = bellVolume; kbd.bell_pitch = bellPitch; kbd.bell_duration = bellDuration; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); @@ -216,7 +216,7 @@ void KBellConfig::ringBell() // store the old state XKeyboardState old_state; - XGetKeyboardControl(kapp->getDisplay(), &old_state); + XGetKeyboardControl(tdeApp->getDisplay(), &old_state); // switch to the test state XKeyboardControl kbd; @@ -226,17 +226,17 @@ void KBellConfig::ringBell() kbd.bell_duration = m_duration->value(); else kbd.bell_duration = 0; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); // ring bell - XBell(kapp->getDisplay(),0); + XBell(tdeApp->getDisplay(),0); // restore old state kbd.bell_percent = old_state.bell_percent; kbd.bell_pitch = old_state.bell_pitch; kbd.bell_duration = old_state.bell_duration; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBBellPercent | KBBellPitch | KBBellDuration, &kbd); } diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h index 844698e9e..ea539e528 100644 --- a/kcontrol/bell/bell.h +++ b/kcontrol/bell/bell.h @@ -29,7 +29,7 @@ class TQPushButton; class KBellConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KBellConfig(TQWidget *parent, const char *name); diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index a492c9deb..6ff8505b5 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kdialog.h> #include <tdeconfig.h> @@ -70,14 +70,14 @@ Dtime::Dtime(TQWidget * parent, const char *name) setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" ); setDateTimeAuto->setText(i18n("Set date and time &automatically:")); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck())); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(serverTimeCheck())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); layout1->addWidget( setDateTimeAuto ); timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" ); - connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged())); - connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged())); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool))); + connect(timeServerList, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged())); + connect(timeServerList, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(configChanged())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), timeServerList, TQ_SLOT(setEnabled(bool))); timeServerList->setEnabled(false); timeServerList->setEditable(true); layout1->addWidget( timeServerList ); @@ -164,12 +164,12 @@ Dtime::Dtime(TQWidget * parent, const char *name) // End Dialog // ************************************************************* - connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate))); + connect( hour, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( minute, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( second, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( cal, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(changeDate(TQDate))); - connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( &internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); load(); @@ -225,17 +225,17 @@ void Dtime::set_time() time.setHMS( hour->value(), minute->value(), second->value() ); kclock->setTime( time ); - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::changeDate(TQDate d) { date = d; - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::configChanged(){ - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::load() @@ -347,11 +347,11 @@ void Dtime::timeout() // get current time time = TQTime::currentTime(); - ontimeout = TRUE; + ontimeout = true; second->setValue(time.second()); minute->setValue(time.minute()); hour->setValue(time.hour()); - ontimeout = FALSE; + ontimeout = false; kclock->setTime( time ); } diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h index 74680d579..ed8819502 100644 --- a/kcontrol/clock/dtime.h +++ b/kcontrol/clock/dtime.h @@ -39,7 +39,7 @@ class Kclock; class HMSTimeWidget : public KIntSpinBox { - Q_OBJECT + TQ_OBJECT public: HMSTimeWidget(TQWidget *parent=0, const char *name=0); protected: @@ -48,7 +48,7 @@ class HMSTimeWidget : public KIntSpinBox class Dtime : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Dtime( TQWidget *parent=0, const char* name=0 ); @@ -97,7 +97,7 @@ private: class Kclock : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Kclock( TQWidget *parent=0, const char *name=0 ) @@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator public: KStrictIntValidator(int bottom, int top, TQWidget * parent, const char * name = 0 ) - : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {}; + : TQIntValidator(bottom, top, parent, name) {}; TQValidator::State validate( TQString & input, int & d ) const; }; diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index a59599b71..e7dcf872f 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -63,11 +63,11 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis dtime = new Dtime(this); layout->addWidget(dtime); - connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); + connect(dtime, TQ_SIGNAL(timeChanged(bool)), this, TQ_SIGNAL(changed(bool))); tzone = new Tzone(this); layout->addWidget(tzone); - connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); + connect(tzone, TQ_SIGNAL(zoneChanged(bool)), this, TQ_SIGNAL(changed(bool))); layout->addStretch(); @@ -89,7 +89,7 @@ void KclockModule::save() #endif // Tell the clock applet about the change so that it can update its timezone - kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); + tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); } void KclockModule::load() diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 7754da34f..01c846f92 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -30,7 +30,7 @@ class TQTabWidget; class KclockModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KclockModule(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 518c6663d..17e80f26d 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -40,7 +40,7 @@ #if defined(USE_SOLARIS) #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <sys/param.h> #include <sys/types.h> #include <sys/stat.h> @@ -52,7 +52,7 @@ Tzone::Tzone(TQWidget * parent, const char *name) setTitle(i18n("To change the timezone, select your area from the list below")); tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb); - connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) ); + connect( tzonelist, TQ_SIGNAL(selectionChanged()), TQ_SLOT(handleZoneChange()) ); m_local = new TQLabel(this); diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h index 1ecfc225e..5887628e9 100644 --- a/kcontrol/clock/tzone.h +++ b/kcontrol/clock/tzone.h @@ -31,7 +31,7 @@ class TQLabel; class Tzone : public TQVGroupBox { - Q_OBJECT + TQ_OBJECT public: Tzone( TQWidget *parent=0, const char* name=0 ); @@ -43,7 +43,7 @@ signals: void zoneChanged(bool); protected slots: - void handleZoneChange() {emit zoneChanged( TRUE );} + void handleZoneChange() {emit zoneChanged( true );} private: void currentZone(); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index b1cc2616a..b91dabc06 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -31,11 +31,11 @@ #include <tdeio/netaccess.h> #include <kipc.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xatom.h> #endif @@ -136,10 +136,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " \"Widget color\" box will change to reflect the part of the preview" " image you clicked.") ); - connect( cs, TQT_SIGNAL( widgetSelected( int ) ), - TQT_SLOT( slotWidgetColor( int ) ) ); - connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)), - TQT_SLOT( slotColorForWidget( int, const TQColor&))); + connect( cs, TQ_SIGNAL( widgetSelected( int ) ), + TQ_SLOT( slotWidgetColor( int ) ) ); + connect( cs, TQ_SIGNAL( colorDropped( int, const TQColor&)), + TQ_SLOT( slotColorForWidget( int, const TQColor&))); topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 ); TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); @@ -149,7 +149,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" @@ -160,22 +160,22 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " another color scheme.") ); addBt = new TQPushButton(i18n("&Save Scheme..."), group); - connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(addBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); TQWhatsThis::add( addBt, i18n("Press this button if you want to save" " the current color settings as a color scheme. You will be" " prompted for a name.") ); removeBt = new TQPushButton(i18n("R&emove Scheme"), group); - removeBt->setEnabled(FALSE); - connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + removeBt->setEnabled(false); + connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" " color scheme. Note that this button is disabled if you do not have" " permission to delete the color scheme.") ); importBt = new TQPushButton(i18n("I&mport Scheme..."), group); - connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport())); + connect(importBt, TQ_SIGNAL(clicked()),TQ_SLOT(slotImport())); TQWhatsThis::add( importBt, i18n("Press this button to import a new color" " scheme. Note that the color scheme will only be available for the" @@ -221,7 +221,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background); wcCombo->adjustSize(); - connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int))); + connect(wcCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidgetColor(int))); groupLayout->addWidget(wcCombo); TQWhatsThis::add( wcCombo, i18n("Click here to select an element of" @@ -230,8 +230,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " of the preview image above.") ); colorButton = new KColorButton( group ); - connect( colorButton, TQT_SIGNAL( changed(const TQColor &)), - TQT_SLOT(slotSelectColor(const TQColor &))); + connect( colorButton, TQ_SIGNAL( changed(const TQColor &)), + TQ_SLOT(slotSelectColor(const TQColor &))); groupLayout->addWidget( colorButton ); @@ -241,7 +241,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this); stackLayout->addWidget(cbShadeList); - connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool))); + connect(cbShadeList, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShadeSortColumnChanged(bool))); TQWhatsThis::add(cbShadeList, i18n("Check this box to show the sorted column in a list with a shaded background")); @@ -254,10 +254,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis groupLayout = new TQHBoxLayout; groupLayout2->addLayout(groupLayout); - sb = new TQSlider( Qt::Horizontal,group,"Slider" ); + sb = new TQSlider( TQt::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( TQ_StrongFocus ); - connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); + sb->setFocusPolicy( TQWidget::StrongFocus ); + connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int))); TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" " of the current color scheme. Contrast does not affect all of the" @@ -272,7 +272,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this); topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 ); - connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); + connect(cbExportColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the" " current color scheme to non-TDE applications.")); @@ -371,8 +371,8 @@ void KColorScheme::save() cfg->sync(); // KDE-1.x support - KSimpleConfig *config = - new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); + TDESimpleConfig *config = + new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); config->writeEntry("background", cs->back ); config->writeEntry("selectBackground", cs->select ); @@ -396,7 +396,7 @@ void KColorScheme::save() flags |= KRdbExportColors; else { -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY // Undo the property xrdb has placed on the root window (if any), // i.e. remove all entries, including ours XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER ); @@ -443,7 +443,7 @@ void KColorScheme::slotSave( ) KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; - KSimpleConfig *config = new KSimpleConfig(sCurrentScheme ); + TDESimpleConfig *config = new TDESimpleConfig(sCurrentScheme ); int i = sCurrentScheme.findRev('/'); if (i >= 0) sCurrentScheme = sCurrentScheme.mid(i+1); @@ -550,8 +550,8 @@ void KColorScheme::slotAdd() valid = true; } - disconnect(sList, TQT_SIGNAL(highlighted(int)), this, - TQT_SLOT(slotPreviewScheme(int))); + disconnect(sList, TQ_SIGNAL(highlighted(int)), this, + TQ_SLOT(slotPreviewScheme(int))); if (exists != -1) { @@ -561,7 +561,7 @@ void KColorScheme::slotAdd() else { sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc"; - KSimpleConfig *config = new KSimpleConfig(sFile); + TDESimpleConfig *config = new TDESimpleConfig(sFile); config->setGroup( "Color Scheme"); config->writeEntry("Name", sName); delete config; @@ -574,7 +574,7 @@ void KColorScheme::slotAdd() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } @@ -595,7 +595,7 @@ void KColorScheme::slotImport() else { TQString sFile = location + file.fileName( false ); - KSimpleConfig *config = new KSimpleConfig(sFile); + TDESimpleConfig *config = new TDESimpleConfig(sFile); config->setGroup( "Color Scheme"); TQString sName = config->readEntry("Name", i18n("Untitled Theme")); delete config; @@ -605,7 +605,7 @@ void KColorScheme::slotImport() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } } @@ -798,7 +798,7 @@ void KColorScheme::readScheme( int index ) KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; - config = new KSimpleConfig(sCurrentScheme, true); + config = new TDESimpleConfig(sCurrentScheme, true); config->setGroup("Color Scheme"); int i = sCurrentScheme.findRev('/'); if (i >= 0) @@ -865,7 +865,7 @@ void KColorScheme::readSchemeNames() // And add them for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig *config = new KSimpleConfig(*it); + TDESimpleConfig *config = new TDESimpleConfig(*it); config->setGroup("Color Scheme"); TQString str = config->readEntry("Name"); if (str.isEmpty()) { diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index ca8718f74..228204556 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -36,7 +36,7 @@ class KColorSchemeList; */ class KColorScheme: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KColorScheme(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index b08ef6135..3ee662627 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets() // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this ); + TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this ); // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); @@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets() TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); -#ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); -#endif vertScrollBar->repaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); @@ -346,7 +344,7 @@ void WidgetCanvas::drawSampleWidgets() // Inactive window - qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, FALSE, + qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, false, &brush); paint.setBrush( iaTitle ); @@ -394,7 +392,7 @@ void WidgetCanvas::drawSampleWidgets() // Active window - qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, FALSE, + qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, false, &brush); paint.setBrush( aTitle );paint.setPen( aTitle ); @@ -434,16 +432,16 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar - //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); paint.setPen(txt ); TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); - //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint, + //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -465,7 +463,7 @@ void WidgetCanvas::drawSampleWidgets() brush.setColor( window ); qDrawShadePanel ( &paint, 25, 80+5-4, width()-7-45-2, - height(), cg, TRUE, 2, &brush); + height(), cg, true, 2, &brush); // Standard text TQFont fnt = TDEGlobalSettings::generalFont(); @@ -528,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets() cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, @@ -585,12 +583,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + parentWidget()->colorGroup(), true, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + repaint( false ); } diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index 60898622b..220b244cc 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/kcontrol/colors/widgetcanvas.h @@ -61,7 +61,7 @@ public: class WidgetCanvas : public TQWidget { - Q_OBJECT + TQ_OBJECT public: WidgetCanvas( TQWidget *parent=0, const char *name=0 ); diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui index 1cbd35a5e..dba44f01c 100644 --- a/kcontrol/componentchooser/browserconfig_ui.ui +++ b/kcontrol/componentchooser/browserconfig_ui.ui @@ -166,9 +166,9 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">selectBrowser()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index e7b807327..3ad2073b1 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -33,11 +33,11 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kopenwith.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include <kurlrequester.h> -#include <kprocess.h> +#include <tdeprocess.h> class MyListBoxItem: public TQListBoxText { @@ -53,7 +53,7 @@ public: CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ m_lookupDict.setAutoDelete(true); m_revLookupDict.setAutoDelete(true); - connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&))); + connect(ComponentSelector,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComponentChanged(const TQString&))); } CfgComponent::~CfgComponent(){} @@ -126,9 +126,9 @@ void CfgComponent::defaults() CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ pSettings = new KEMailSettings(); - connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); - connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) ); - connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); + connect(kmailCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) ); + connect(txtEMailClient, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) ); + connect(chkRunTerminal, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); } CfgEmailClient::~CfgEmailClient() { @@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *) if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); - kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); emit changed(false); } @@ -252,9 +252,9 @@ void CfgFileManager::selectFileAssociations() //BEGIN Terminal Emulator Configuration CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ - connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged())); - connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); - connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(terminalLE,TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(configChanged())); + connect(terminalCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); + connect(otherCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); } CfgTerminalEmulator::~CfgTerminalEmulator() { @@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) { delete config; KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null); + tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null); emit changed(false); } @@ -323,9 +323,9 @@ void CfgTerminalEmulator::selectTerminalApp() //BEGIN Browser Configuration CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ - connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged())); - connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); - connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(lineExec,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(configChanged())); + connect(radioKIO,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); + connect(radioExec,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); } CfgBrowser::~CfgBrowser() { @@ -425,13 +425,13 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); for (TQStringList::Iterator it=services.begin();it!=services.end();++it) { - KSimpleConfig cfg(*it); + TDESimpleConfig cfg(*it); ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); } ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); - connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); + connect(ServiceChooser,TQ_SIGNAL(highlighted(TQListBoxItem*)),this,TQ_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); slotServiceSelected(ServiceChooser->item(0)); @@ -443,7 +443,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { if (somethingChanged) { if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save(); } - KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); + TDESimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); @@ -504,7 +504,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { configContainer->removeWidget(configWidget); delete configWidget; configWidget=newConfigWidget; - connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); + connect(configWidget,TQ_SIGNAL(changed(bool)),this,TQ_SLOT(emitChanged(bool))); configContainer->setMinimumSize(configWidget->sizeHint()); } @@ -534,7 +534,7 @@ void ComponentChooser::load() { configWidget->tqt_cast( "CfgPlugin" ) ); if( plugin ) { - KSimpleConfig cfg(latestEditedService); + TDESimpleConfig cfg(latestEditedService); plugin->load( &cfg ); } } @@ -547,7 +547,7 @@ void ComponentChooser::save() { configWidget->tqt_cast( "CfgPlugin" ) ); if( plugin ) { - KSimpleConfig cfg(latestEditedService); + TDESimpleConfig cfg(latestEditedService); plugin->save( &cfg ); } } diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h index 3649ca218..7eec4d152 100644 --- a/kcontrol/componentchooser/componentchooser.h +++ b/kcontrol/componentchooser/componentchooser.h @@ -47,7 +47,7 @@ public: class CfgComponent: public ComponentConfig_UI,public CfgPlugin { -Q_OBJECT +TQ_OBJECT public: CfgComponent(TQWidget *parent); virtual ~CfgComponent(); @@ -67,7 +67,7 @@ signals: class CfgEmailClient: public EmailClientConfig_UI,public CfgPlugin { -Q_OBJECT +TQ_OBJECT public: CfgEmailClient(TQWidget *parent); virtual ~CfgEmailClient(); @@ -87,7 +87,7 @@ signals: class CfgFileManager: public FileManagerConfig_UI,public CfgPlugin { -Q_OBJECT +TQ_OBJECT public: CfgFileManager(TQWidget *parent); virtual ~CfgFileManager(); @@ -105,7 +105,7 @@ signals: class CfgTerminalEmulator: public TerminalEmulatorConfig_UI,public CfgPlugin { -Q_OBJECT +TQ_OBJECT public: CfgTerminalEmulator(TQWidget *parent); virtual ~CfgTerminalEmulator(); @@ -123,7 +123,7 @@ signals: class CfgBrowser: public BrowserConfig_UI,public CfgPlugin { -Q_OBJECT +TQ_OBJECT public: CfgBrowser(TQWidget *parent); virtual ~CfgBrowser(); @@ -146,7 +146,7 @@ private: class ComponentChooser : public ComponentChooser_UI { -Q_OBJECT +TQ_OBJECT public: ComponentChooser(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui index ce89822d7..b8091e9ed 100644 --- a/kcontrol/componentchooser/emailclientconfig_ui.ui +++ b/kcontrol/componentchooser/emailclientconfig_ui.ui @@ -228,9 +228,9 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">selectEmailClient()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/filemanagerconfig_ui.ui b/kcontrol/componentchooser/filemanagerconfig_ui.ui index fbcd23d43..ec78226c3 100644 --- a/kcontrol/componentchooser/filemanagerconfig_ui.ui +++ b/kcontrol/componentchooser/filemanagerconfig_ui.ui @@ -116,9 +116,9 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">selectFileAssociations()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 30750bdd5..279a16fc1 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -27,7 +27,7 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): (new TQVBoxLayout(this))->setAutoAdd(true); m_chooser=new ComponentChooser(this,"ComponentChooser"); - connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); + connect(m_chooser,TQ_SIGNAL(changed(bool)),this,TQ_SIGNAL(changed(bool))); setButtons( Help | Apply ); TDEAboutData *about = @@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){ extern "C" { - KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * ) { TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index 001306506..5d93fbb9b 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -24,7 +24,7 @@ class TDEAboutData; class KCMComponentChooser : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMComponentChooser( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui index cbb79cb9f..047d8e6be 100644 --- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui +++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui @@ -186,9 +186,9 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">selectTerminalApp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 034d69897..d289f4aed 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -55,21 +55,21 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); _filename = new KLineEdit(this); grid->addMultiCellWidget(_filename, 6, 6, 0, 4); - connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport())); + connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(_filename, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotExport())); _choose = new TQPushButton("...", this); grid->addWidget(_choose, 6, 5); - connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose())); + connect(_choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChoose())); _export = new TQPushButton(i18n("&Export"), this); grid->addWidget(_export, 8, 4); - connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport())); + connect(_export, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport())); _export->setEnabled(false); _cancel = new TQPushButton(i18n("&Cancel"), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); } diff --git a/kcontrol/crypto/certexport.h b/kcontrol/crypto/certexport.h index 54511e04c..aeca9aaa9 100644 --- a/kcontrol/crypto/certexport.h +++ b/kcontrol/crypto/certexport.h @@ -31,7 +31,7 @@ class KSSLCertificate; class KCertExport : public KDialog { - Q_OBJECT + TQ_OBJECT public: KCertExport(TQWidget *parent = 0L, const char *name = 0L); virtual ~KCertExport(); diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index f8558c866..a1efa58d0 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -62,11 +62,11 @@ #include <kmdcodec.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpushbutton.h> #include <kresolver.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <kurlrequester.h> @@ -265,7 +265,7 @@ TQString whatstr; grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); - connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseTLS, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" @@ -273,14 +273,14 @@ TQString whatstr; TQWhatsThis::add(mUseTLS, whatstr); mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); - connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseSSLv2, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseSSLv2, 1, 0); whatstr = i18n("SSL v2 is the second revision of the SSL protocol." " It is most common to enable v2 and v3."); TQWhatsThis::add(mUseSSLv2, whatstr); mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL); - connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseSSLv3, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseSSLv3, 1, 1); whatstr = i18n("SSL v3 is the third revision of the SSL protocol." " It is most common to enable v2 and v3."); @@ -296,8 +296,8 @@ TQString whatstr; SSLv2Box->setSelectionMode(TQListView::NoSelection); grid->addWidget( SSLv2Box, 2, 0 ); - connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ), - SSLv2Box, TQT_SLOT( setEnabled( bool ))); + connect( mUseSSLv2, TQ_SIGNAL( toggled( bool ) ), + SSLv2Box, TQ_SLOT( setEnabled( bool ))); #else TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured" " because this module was not linked" @@ -308,9 +308,9 @@ TQString whatstr; // no need to parse kdeglobals. config = new TDEConfig("cryptodefaults", false, false); - policies = new KSimpleConfig("ksslpolicies", false); - pcerts = new KSimpleConfig("ksslcertificates", false); - authcfg = new KSimpleConfig("ksslauthmap", false); + policies = new TDESimpleConfig("ksslpolicies", false); + pcerts = new TDESimpleConfig("ksslcertificates", false); + authcfg = new TDESimpleConfig("ksslauthmap", false); #ifdef HAVE_SSL SSLv3Box = new TQListView(tabSSL, "v3ciphers"); @@ -321,8 +321,8 @@ TQString whatstr; TQWhatsThis::add(SSLv3Box, whatstr); SSLv3Box->setSelectionMode(TQListView::NoSelection); grid->addWidget(SSLv3Box, 2, 1); - connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ), - SSLv3Box, TQT_SLOT( setEnabled( bool ))); + connect( mUseSSLv3, TQ_SIGNAL( toggled( bool ) ), + SSLv3Box, TQ_SLOT( setEnabled( bool ))); loadCiphers(); @@ -346,7 +346,7 @@ TQString whatstr; TQWhatsThis::add(cwcb, whatStr); - connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int))); + connect(cwcb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectCipher(int))); @@ -354,21 +354,21 @@ TQString whatstr; #endif mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL); - connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnEnter, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnEnter, 5, 0); whatstr = i18n("If selected, you will be notified when entering an SSL" " enabled site"); TQWhatsThis::add(mWarnOnEnter, whatstr); mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL); - connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnLeave, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnLeave, 5, 1); whatstr = i18n("If selected, you will be notified when leaving an SSL" " based site."); TQWhatsThis::add(mWarnOnLeave, whatstr); mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL); - connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnUnencrypted, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnUnencrypted, 6, 0); whatstr = i18n("If selected, you will be notified before sending" " unencrypted data via a web browser."); @@ -376,7 +376,7 @@ TQString whatstr; #if 0 // NOT IMPLEMENTED IN KDE 3.0 mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL); - connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnMixed, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnMixed, 6, 1); whatstr = i18n("If selected, you will be notified if you view a page" " that has both encrypted and non-encrypted parts."); @@ -396,9 +396,9 @@ TQString whatstr; oPath = new KURLRequester(oInfo); oPath->setMode(KFile::Directory); oTest = new TQPushButton(i18n("&Test"), oInfo); - connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL())); + connect(oTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTestOSSL())); - connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); + connect(oPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged())); // // Settings for the EGD @@ -406,9 +406,9 @@ TQString whatstr; TQFrame *eFrame = new TQFrame(tabOSSL); TQVBoxLayout *egrid = new TQVBoxLayout(eFrame); mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame); - connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD())); + connect(mUseEGD, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEGD())); mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame); - connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile())); + connect(mUseEFile, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEFile())); vbox->addWidget(eFrame); egrid->addWidget(mUseEGD); egrid->addWidget(mUseEFile); @@ -419,7 +419,7 @@ TQString whatstr; grid2->addWidget(mEGDLabel, 0, 0); mEGDPath = new KURLRequester(egdframe); grid2->addWidget(mEGDPath, 0, 1); - connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); + connect(mEGDPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged())); vbox->addWidget(egdframe); whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering" " daemon (EGD) for initializing the pseudo-random number generator."); @@ -454,35 +454,35 @@ TQString whatstr; grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4); yourSSLBox->addColumn(i18n("Common Name")); yourSSLBox->addColumn(i18n("Email Address")); - connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect())); + connect(yourSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotYourCertSelect())); yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert); - connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport())); + connect(yourSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourImport())); grid->addWidget(yourSSLImport, 0, 5); yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert); yourSSLExport->setEnabled(false); - connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport())); + connect(yourSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourExport())); grid->addWidget(yourSSLExport, 1, 5); yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert); yourSSLRemove->setEnabled(false); - connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove())); + connect(yourSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourRemove())); grid->addWidget(yourSSLRemove, 2, 5); yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert); yourSSLUnlock->setEnabled(false); - connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock())); + connect(yourSSLUnlock, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourUnlock())); grid->addWidget(yourSSLUnlock, 3, 5); yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert); yourSSLVerify->setEnabled(false); - connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify())); + connect(yourSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourVerify())); grid->addWidget(yourSSLVerify, 4, 5); yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert); yourSSLPass->setEnabled(false); - connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass())); + connect(yourSSLPass, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourPass())); grid->addWidget(yourSSLPass, 5, 5); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5); @@ -579,14 +579,14 @@ TQString whatstr; hostCertBG->setEnabled(false); authRemove->setEnabled(false); - connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); - connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged())); - connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth())); - connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth())); - connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &))); - connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons())); - connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo())); + connect(defCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(defCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); + connect(hostAuthList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotAuthItemChanged())); + connect(authAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewHostAuth())); + connect(authRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveHostAuth())); + connect(authHost, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotAuthText(const TQString &))); + connect(hostCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAuthButtons())); + connect(hostCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAuthCombo())); #else nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" @@ -607,7 +607,7 @@ TQString whatstr; otherSSLBox = new TQListView(tabOtherSSLCert); otherSSLBox->setAllColumnsShowFocus(true); - connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect())); + connect(otherSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotOtherCertSelect())); whatstr = i18n("This list box shows which site and person certificates TDE" " knows about. You can easily manage them from here."); TQWhatsThis::add(otherSSLBox, whatstr); @@ -616,21 +616,21 @@ TQString whatstr; grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4); otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert); - connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert())); + connect(otherSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotExportCert())); grid->addWidget(otherSSLExport, 0, 5); whatstr = i18n("This button allows you to export the selected certificate" " to a file of various formats."); TQWhatsThis::add(otherSSLExport, whatstr); otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert); - connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert())); + connect(otherSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveCert())); grid->addWidget(otherSSLRemove, 1, 5); whatstr = i18n("This button removes the selected certificate" " from the certificate cache."); TQWhatsThis::add(otherSSLRemove, whatstr); otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert); - connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert())); + connect(otherSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotVerifyCert())); grid->addWidget(otherSSLVerify, 2, 5); whatstr = i18n("This button tests the selected certificate" " for validity."); @@ -675,9 +675,9 @@ TQString whatstr; cachePerm->setEnabled(false); cacheUntil->setEnabled(false); untilDate->setEnabled(false); - connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent())); - connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil())); - connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick())); + connect(cachePerm, TQ_SIGNAL(clicked()), TQ_SLOT(slotPermanent())); + connect(cacheUntil, TQ_SIGNAL(clicked()), TQ_SLOT(slotUntil())); + connect(untilDate, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotDatePick())); whatstr = i18n("Select here to make the cache entry permanent."); TQWhatsThis::add(cachePerm, whatstr); whatstr = i18n("Select here to make the cache entry temporary."); @@ -691,7 +691,7 @@ TQString whatstr; policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup); policyGroup->setEnabled(false); grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5); - connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int))); + connect(policyGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPolicyChanged(int))); whatstr = i18n("Select this to always accept this certificate."); TQWhatsThis::add(policyAccept, whatstr); whatstr = i18n("Select this to always reject this certificate."); @@ -729,19 +729,19 @@ TQString whatstr; caList->addColumn(i18n("Organization")); caList->addColumn(i18n("Organizational Unit")); caList->addColumn(i18n("Common Name")); - connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged())); + connect(caList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotCAItemChanged())); caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA); - connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport())); + connect(caSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAImport())); grid->addWidget(caSSLImport, 0, 7); caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA); - connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove())); + connect(caSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARemove())); grid->addWidget(caSSLRemove, 1, 7); caSSLRemove->setEnabled(false); caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA); - connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore())); + connect(caSSLRestore, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARestore())); grid->addWidget(caSSLRestore, 2, 7); caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString())); @@ -754,11 +754,11 @@ TQString whatstr; caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA); caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA); grid->addMultiCellWidget(caSite, 7, 7, 0, 3); - connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caSite, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); grid->addMultiCellWidget(caEmail, 8, 8, 0, 3); - connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caEmail, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); grid->addMultiCellWidget(caCode, 9, 9, 0, 3); - connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caCode, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); @@ -785,11 +785,11 @@ TQString whatstr; #ifdef HAVE_SSL grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint()); mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts); - connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnSelfSigned, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts); - connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnExpired, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts); - connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnRevoked, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3); grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3); grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3); @@ -807,15 +807,15 @@ TQString whatstr; grid->addMultiCellWidget(macBox, 5, 8, 0, 2); macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts); - //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); + //connect(macAdd, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macAdd, 4, 3); macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts); - //connect(macRemove, TQT_SIGNAL(), TQT_SLOT()); + //connect(macRemove, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macRemove, 5, 3); macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts); - //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); + //connect(macAdd, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macClear, 6, 3); #else @@ -1540,7 +1540,7 @@ TQString iss = TQString(); TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1548,7 +1548,7 @@ TQString iss = TQString(); validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1558,7 +1558,7 @@ TQString iss = TQString(); validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires()) - : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); + : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(TQt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -1778,7 +1778,7 @@ TQString iss; TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1786,7 +1786,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1818,7 +1818,7 @@ TQString iss; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1826,7 +1826,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h index 8a353ae04..bdb0d74ec 100644 --- a/kcontrol/crypto/crypto.h +++ b/kcontrol/crypto/crypto.h @@ -34,7 +34,7 @@ #include <tqvbuttongroup.h> #include <tdecmodule.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> class TQGridLayout; class TQVButtonGroup; @@ -217,7 +217,7 @@ private: class KCryptoConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCryptoConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list = TQStringList()); virtual ~KCryptoConfig(); @@ -354,7 +354,7 @@ private: TQLabel *cHash; TDEConfig *config; - KSimpleConfig *policies, *pcerts, *authcfg; + TDESimpleConfig *policies, *pcerts, *authcfg; TDEConfig *cacfg; bool ___lehack; // to hack around a lineedit problem diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index f7cd9d1cb..335e5e634 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -58,11 +58,11 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); _ok = new KPushButton(KStdGuiItem::ok(), this); grid->addWidget(_ok, 8, 4); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); _cancel = new KPushButton(KStdGuiItem::cancel(), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } @@ -107,7 +107,7 @@ void KDateTimeDlg::setTime(const TQTime& qtime) { void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) { - _date->setDate(TQT_TQDATE_OBJECT(qdatetime.date())); + _date->setDate(qdatetime.date()); _hours->setValue(qdatetime.time().hour()); _mins->setValue(qdatetime.time().minute()); _secs->setValue(qdatetime.time().second()); diff --git a/kcontrol/crypto/kdatetimedlg.h b/kcontrol/crypto/kdatetimedlg.h index 92b62193b..ddc0531b8 100644 --- a/kcontrol/crypto/kdatetimedlg.h +++ b/kcontrol/crypto/kdatetimedlg.h @@ -34,7 +34,7 @@ class KDateTimeDlgPrivate; class KDateTimeDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: KDateTimeDlg(TQWidget *parent = 0L, const char *name = 0L); virtual ~KDateTimeDlg(); diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index e2e043f76..d66e6b5f3 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -12,7 +12,7 @@ #include <tdefontdialog.h> #include <kgenericfactory.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "cssconfig.h" @@ -50,46 +50,46 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) TDEFontChooser::getFontList(fonts, 0); customDialog->fontFamily->insertStringList(fonts); - connect(configDialog->useDefault, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useAccess, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useUser, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(configDialog->customize, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCustomize())); - connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->dontScale, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->customColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->sameFamily, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->preview, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPreview())); - connect(customDialog->sameColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideImages, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideBackground, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); + connect(configDialog->useDefault, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useAccess, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useUser, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->urlRequester, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(configDialog->customize, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCustomize())); + connect(customDialog->basefontsize, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->basefontsize, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->dontScale, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->blackOnWhite, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->whiteOnBlack, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->customColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->foregroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->backgroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->sameFamily, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->preview, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPreview())); + connect(customDialog->sameColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideImages, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideBackground, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0); vbox->addWidget(configDialog); @@ -193,7 +193,7 @@ void CSSConfig::save() { CSSTemplate css(templ); - dest = kapp->dirs()->saveLocation("data", "kcmcss"); + dest = tdeApp->dirs()->saveLocation("data", "kcmcss"); dest += "/override.css"; css.expand(dest, cssDict()); @@ -342,13 +342,13 @@ void CSSConfig::slotPreview() if (customDialog->blackOnWhite->isChecked()) { - back = Qt::white; - fore = Qt::black; + back = TQt::white; + fore = TQt::black; } else if (customDialog->whiteOnBlack->isChecked()) { - back = Qt::black; - fore = Qt::white; + back = TQt::black; + fore = TQt::white; } else { diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h index da93fcdf5..b1b944416 100644 --- a/kcontrol/css/kcmcss.h +++ b/kcontrol/css/kcmcss.h @@ -31,7 +31,7 @@ class KDialogBase; class CSSConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index b3e15d021..30e940550 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -63,7 +63,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) top->addWidget( kcm ); m_tabs->addTab( page, label ); - connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) ); + connect( kcm, TQ_SIGNAL( changed(bool) ), TQ_SLOT( moduleChanged(bool) ) ); m_modules.insert(kcm, false); } else @@ -85,7 +85,7 @@ void KCMDisplay::save() void KCMDisplay::moduleChanged( bool isChanged ) { - TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); + TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(const_cast<TQObject*>(sender()))); Q_ASSERT(currentModule != m_modules.end()); if (currentModule.data() == isChanged) return; diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h index 42373a42f..84b30c79e 100644 --- a/kcontrol/display/display.h +++ b/kcontrol/display/display.h @@ -26,7 +26,7 @@ class TQTabWidget; class KCMDisplay : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMDisplay( TQWidget *parent, const char *name, const TQStringList& ); diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 4c96fabf1..a5c3205b3 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -47,10 +47,10 @@ #include <kurlrequester.h> #include <tdecmoduleloader.h> #include <kgenericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <unistd.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <string> #include <stdio.h> #include <tqstring.h> @@ -64,7 +64,7 @@ typedef KGenericFactory<KDisplayConfig, TQWidget> KDisplayCFactory; K_EXPORT_COMPONENT_FACTORY( kcm_displayconfig, KDisplayCFactory("kcmdisplayconfig") ) -KSimpleConfig *systemconfig; +TDESimpleConfig *systemconfig; TQPoint moveTQRectOutsideTQRect(TQRect base, TQRect movable, int fallback_level = 0) { TQPoint final_result; @@ -434,8 +434,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == monitor_id) { moved_monitor = monitor; screendata = m_screenInfoArray[activeProfileName].at(moved_monitor->screen_id); @@ -475,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor primary_monitor = monitor; @@ -548,8 +548,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor != monitor_to_move) { other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry())); } @@ -592,8 +592,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor != monitor_to_move) { other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry())); } @@ -641,8 +641,8 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor primary_monitor = monitor; @@ -745,18 +745,18 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin { #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif m_randrsimple = new KRandrSimpleAPI(); TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); if (getuid() != 0) { - systemconfig = new KSimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" ); + systemconfig = new TDESimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" ); systemconfig->setFileWriteMode(0600); } else { - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" )); + systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" )); systemconfig->setFileWriteMode(0644); } @@ -769,7 +769,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin setAboutData( about ); m_gammaApplyTimer = new TQTimer(); - connect(m_gammaApplyTimer, SIGNAL(timeout()), this, SLOT(applyGamma())); + connect(m_gammaApplyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(applyGamma())); base = new DisplayConfigBase(this); profileRulesGrid = new TQGridLayout(base->profileRulesGridWidget, 1, 1, KDialog::marginHint()); @@ -792,54 +792,54 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin base->nonRootWarningLabel->hide(); } - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(processLockoutControls())); - connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile())); - connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile())); - connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile())); - connect(base->activateProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateProfile())); - connect(base->reloadProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reloadProfileFromDisk())); - connect(base->saveProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveProfile())); - connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockoutControls())); - connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectDefaultProfile(int))); - connect(base->displayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int))); - - connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(base->gammaTargetSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaTargetChanged(int))); - connect(base->rotationSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(rotationInfoChanged())); - connect(base->refreshRateDD, TQT_SIGNAL(activated(int)), TQT_SLOT(refreshInfoChanged())); - connect(base->orientationHFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged())); - connect(base->orientationVFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged())); - connect(base->resolutionSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resolutionSliderChanged(int))); - connect(base->gammaAllSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaAllSliderChanged(int))); - connect(base->gammaRedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaRedSliderChanged(int))); - connect(base->gammaGreenSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaGreenSliderChanged(int))); - connect(base->gammaBlueSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaBlueSliderChanged(int))); - connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(selectScreen(int))); - connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaselectScreen(int))); - connect(base->systemEnableDPMS, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSStandby, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSPowerDown, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->dpmsStandbyTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->dpmsSuspendTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->dpmsPowerDownTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->monitorPhyArrange, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay())); - - connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(ensurePrimaryMonitorIsAvailable())); - connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(updateExtendedMonitorInformation())); - - connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQT_SLOT(setEnabled(bool))); - - connect(base->rescanHardware, TQT_SIGNAL(clicked()), TQT_SLOT(rescanHardware())); - connect(base->loadExistingProfile, TQT_SIGNAL(clicked()), TQT_SLOT(reloadProfile())); - connect(base->previewConfiguration, TQT_SIGNAL(clicked()), TQT_SLOT(activatePreview())); - connect(base->identifyMonitors, TQT_SIGNAL(clicked()), TQT_SLOT(identifyMonitors())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(processLockoutControls())); + connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile())); + connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile())); + connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile())); + connect(base->activateProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateProfile())); + connect(base->reloadProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reloadProfileFromDisk())); + connect(base->saveProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveProfile())); + connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockoutControls())); + connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectDefaultProfile(int))); + connect(base->displayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int))); + + connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(base->gammaTargetSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaTargetChanged(int))); + connect(base->rotationSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(rotationInfoChanged())); + connect(base->refreshRateDD, TQ_SIGNAL(activated(int)), TQ_SLOT(refreshInfoChanged())); + connect(base->orientationHFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged())); + connect(base->orientationVFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged())); + connect(base->resolutionSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resolutionSliderChanged(int))); + connect(base->gammaAllSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaAllSliderChanged(int))); + connect(base->gammaRedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaRedSliderChanged(int))); + connect(base->gammaGreenSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaGreenSliderChanged(int))); + connect(base->gammaBlueSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaBlueSliderChanged(int))); + connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(selectScreen(int))); + connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaselectScreen(int))); + connect(base->systemEnableDPMS, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSStandby, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSPowerDown, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->dpmsStandbyTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->dpmsSuspendTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->dpmsPowerDownTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->monitorPhyArrange, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay())); + + connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(ensurePrimaryMonitorIsAvailable())); + connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(updateExtendedMonitorInformation())); + + connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQ_SLOT(setEnabled(bool))); + + connect(base->rescanHardware, TQ_SIGNAL(clicked()), TQ_SLOT(rescanHardware())); + connect(base->loadExistingProfile, TQ_SIGNAL(clicked()), TQ_SLOT(reloadProfile())); + connect(base->previewConfiguration, TQ_SIGNAL(clicked()), TQ_SLOT(activatePreview())); + connect(base->identifyMonitors, TQ_SIGNAL(clicked()), TQ_SLOT(identifyMonitors())); load(); @@ -914,26 +914,26 @@ void KDisplayConfig::identifyMonitors () { if (!randr_screen_info->outputs[i]->cur_crtc) { continue; } - idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM | Qt::WDestructiveClose); + idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WX11BypassWM | TQt::WDestructiveClose); widgetList.append(idWidget); idWidget->resize(150, 100); - idWidget->setAlignment(Qt::AlignCenter); + idWidget->setAlignment(TQt::AlignCenter); TQFont font = idWidget->font(); font.setBold( true ); font.setPointSize(24); idWidget->setFont( font ); - idWidget->setPaletteForegroundColor(Qt::white); - idWidget->setPaletteBackgroundColor(Qt::black); + idWidget->setPaletteForegroundColor(TQt::white); + idWidget->setPaletteBackgroundColor(TQt::black); idWidget->show(); KDialog::centerOnScreen(idWidget, i); - TQTimer::singleShot(3000, idWidget, SLOT(close())); + TQTimer::singleShot(3000, idWidget, TQ_SLOT(close())); } m_randrsimple->freeScreenInfoStructure(randr_screen_info); } void KDisplayConfig::activatePreview() { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true); } void KDisplayConfig::load() @@ -1080,10 +1080,10 @@ void KDisplayConfig::renameProfile () { void KDisplayConfig::activateProfile() { if (getuid() != 0) { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, locateLocal("config", "/", true)); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, locateLocal("config", "/", true)); } else { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, KDE_CONFDIR); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, KDE_CONFDIR); } rescanHardware(); } @@ -1329,9 +1329,9 @@ void KDisplayConfig::updateDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - TQWidget *monitor = TQT_TQWIDGET(monitors.at( i )); - if ( !monitor->close(TRUE) ) { + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + TQWidget *monitor = static_cast<TQWidget*>(monitors.at( i )); + if ( !monitor->close(true) ) { Q_ASSERT("zombie monitor will not go away!"); } } @@ -1349,9 +1349,9 @@ void KDisplayConfig::updateDragDropDisplay() { if (((j==0) && (screendata->is_primary==true)) || ((j==1) && (screendata->is_primary==false))) { // This ensures that the primary monitor is always the first one created and placed on the configuration widget bool isvisiblyrotated = ((screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX)); DraggableMonitor *m = new DraggableMonitor( base->monitorPhyArrange, 0, WStyle_Customize | WDestructiveClose | WStyle_NoBorder | WX11BypassWM ); - connect(m, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay())); - connect(m, TQT_SIGNAL(monitorSelected(int)), this, TQT_SLOT(selectScreen(int))); - connect(m, TQT_SIGNAL(monitorDragComplete(int)), this, TQT_SLOT(updateDraggableMonitorInformation(int))); + connect(m, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay())); + connect(m, TQ_SIGNAL(monitorSelected(int)), this, TQ_SLOT(selectScreen(int))); + connect(m, TQ_SIGNAL(monitorDragComplete(int)), this, TQ_SLOT(updateDraggableMonitorInformation(int))); m->screen_id = i; if (isvisiblyrotated) m->setFixedSize(screendata->current_y_pixel_count*base->monitorPhyArrange->resize_factor, screendata->current_x_pixel_count*base->monitorPhyArrange->resize_factor); @@ -1381,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id); moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position); } @@ -1536,7 +1536,7 @@ void KDisplayConfig::gammaAllSliderChanged(int index) { screendata->gamma_green = ((float)base->gammaAllSlider->value())/10.0; screendata->gamma_blue = ((float)base->gammaAllSlider->value())/10.0; - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1558,7 +1558,7 @@ void KDisplayConfig::gammaRedSliderChanged(int index) { screendata->gamma_red = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1580,7 +1580,7 @@ void KDisplayConfig::gammaGreenSliderChanged(int index) { screendata->gamma_green = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1602,7 +1602,7 @@ void KDisplayConfig::gammaBlueSliderChanged(int index) { screendata->gamma_blue = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1670,8 +1670,8 @@ void KDisplayConfig::createHotplugRulesGrid() { int index = (*it2).outputs.findIndex(m_hardwareScreenInfoArray.at(j)->screenUniqueName); TQCheckBox* cb = new TQCheckBox(base->profileRulesGridWidget, (TQString("%1:%2").arg(i).arg(j)).ascii()); - connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(profileRuleCheckBoxStateChanged(int))); - connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); + connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(profileRuleCheckBoxStateChanged(int))); + connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); cb->setTristate(true); if (index < 0) { cb->setNoChange(); @@ -1693,7 +1693,7 @@ void KDisplayConfig::createHotplugRulesGrid() { cb->show(); } KComboBox* combo = new KComboBox(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii()); - connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); combo->insertItem(i18n("<default>")); for (TQStringList::Iterator it3 = availableProfileNames.begin(); it3 != availableProfileNames.end(); ++it3) { combo->insertItem(*it3); @@ -1703,8 +1703,8 @@ void KDisplayConfig::createHotplugRulesGrid() { combo->show(); TQPushButton* button = new TQPushButton(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii()); button->setText(i18n("Delete Rule")); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfileRule())); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfileRule())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); profileRulesGrid->addWidget(button, i+1, j+2); button->show(); i++; @@ -1712,8 +1712,8 @@ void KDisplayConfig::createHotplugRulesGrid() { TQPushButton* button = new TQPushButton(base->profileRulesGridWidget); button->setText(i18n("Add New Rule")); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewProfileRule())); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewProfileRule())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); profileRulesGrid->addMultiCellWidget(button, i+2, i+2, 0, numberOfScreens+2); button->show(); } @@ -1921,7 +1921,7 @@ TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label ) top->addWidget( kcm ); base->mainTabContainerWidget->addTab( page, label ); - connect( kcm, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( changed() ) ); + connect( kcm, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( changed() ) ); //m_modules.insert(kcm, false); return kcm; } @@ -1992,7 +1992,7 @@ void KDisplayConfig::saveActiveSystemWideProfileToDisk() void KDisplayConfig::save() { - if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE)) { + if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true)) { saveActiveSystemWideProfileToDisk(); updateProfileConfigObjectFromGrid(); @@ -2020,8 +2020,8 @@ void KDisplayConfig::save() else { // Signal that settings were NOT applied TQTimer *t = new TQTimer( this ); - connect(t, SIGNAL(timeout()), SLOT(changed()) ); - t->start( 100, FALSE ); + connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) ); + t->start( 100, false ); } } diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 8ce466daa..259c31391 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -50,7 +50,7 @@ typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap; class KDisplayConfig : public TDECModule, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui index edd6a2328..0595d65aa 100644 --- a/kcontrol/displayconfig/displayconfigbase.ui +++ b/kcontrol/displayconfig/displayconfigbase.ui @@ -913,9 +913,9 @@ <includes> <include location="local" impldecl="in implementation">DisplayConfigBase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">kcombobox.h</include> diff --git a/kcontrol/displayconfig/monitorworkspace.h b/kcontrol/displayconfig/monitorworkspace.h index 8384d090b..10df2378a 100644 --- a/kcontrol/displayconfig/monitorworkspace.h +++ b/kcontrol/displayconfig/monitorworkspace.h @@ -50,7 +50,7 @@ private: class DraggableMonitor: public TQLabel { - Q_OBJECT + TQ_OBJECT public: DraggableMonitor( TQWidget* parent, const char* name, int wflags ); @@ -77,7 +77,7 @@ private: class MonitorWorkspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: MonitorWorkspace( TQWidget* parent, const char* name ); diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index b2d9eb8b0..ce03182e0 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -300,9 +300,9 @@ is configured with 'Browse local network' option above.</string> </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>radioButton2_2_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index d1fe3269c..0bad0dfa7 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -35,10 +35,10 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdeparts/genericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <kpassdlg.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <tdemessagebox.h> @@ -65,13 +65,13 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" )); + domain = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" )); domain->setGroup("publishing"); load(); - connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool))); + connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(secretedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(domainedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(enableZeroconf,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableZeroconfChanged(bool))); m_enableZeroconfChanged=false; if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false); kcfg_PublishType->hide(); //unused with Avahi @@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd() void KCMDnssd::save() { - setCursor(TQCursor(Qt::BusyCursor)); + setCursor(TQCursor(TQt::BusyCursor)); TDECModule::save(); if (geteuid()==0 && m_wdchanged) saveMdnsd(); domain->setFileWriteMode(0644); // this should be readable for everyone @@ -112,17 +112,17 @@ void KCMDnssd::save() proc->start(TDEProcess::Block); } } - setCursor(TQCursor(Qt::ArrowCursor)); + setCursor(TQCursor(TQt::ArrowCursor)); } void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus"); + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { - kapp->processEvents(); + tdeApp->processEvents(); } int exitStatus = avahiStatus.exitStatus(); if (exitStatus == 0) { // disabled diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h index b408ca3f6..ebc26530d 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/kcontrol/dnssd/kcmdnssd.h @@ -26,10 +26,10 @@ #include <configdialog.h> #include <tdeaboutdata.h> -class KSimpleConfig; +class TDESimpleConfig; class KCMDnssd: public ConfigDialog { - Q_OBJECT + TQ_OBJECT public: KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); @@ -45,7 +45,7 @@ private: bool saveMdnsd(); TQMap<TQString,TQString> mdnsdLines; bool m_wdchanged; - KSimpleConfig* domain; + TDESimpleConfig* domain; bool m_enableZeroconfChanged; }; diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h index 3ea140ffc..ccc26cc91 100644 --- a/kcontrol/ebrowsing/filteropts.h +++ b/kcontrol/ebrowsing/filteropts.h @@ -29,7 +29,7 @@ class TQListBox; class FilterOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: FilterOptions(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index 9eeec46e1..f6117ed17 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -61,7 +61,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS #if 0 opts = new FilterOptions(this); tab->addTab(opts, i18n("&Filters")); - connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(opts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); #endif modules.setAutoDelete(true); @@ -75,7 +75,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS { modules.append(module); helper.insert(it.current()->configName(), module); - connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(module, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); } } diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h index 4234ffe3e..3b4b83985 100644 --- a/kcontrol/ebrowsing/main.h +++ b/kcontrol/ebrowsing/main.h @@ -30,7 +30,7 @@ class KURIFilter; class KURIFilterModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index eb96f682a..622cec32c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -38,8 +38,8 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kservice.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include "ikwsopts.h" @@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults ) m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true); // Connect all the signals/slots... - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(setWebShortcutState())); - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(updateSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - - - connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider())); - connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(setWebShortcutState())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(updateSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + + + connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider())); + connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider())); emit changed( useDefaults ); } @@ -223,7 +223,7 @@ void FilterOptions::save() // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl; int changedProviderCount = 0; - TQString path = kapp->dirs()->saveLocation("services", "searchproviders/"); + TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/"); m_favoriteEngines.clear(); @@ -274,7 +274,7 @@ void FilterOptions::save() } } - KSimpleConfig service(path + name + ".desktop"); + TDESimpleConfig service(path + name + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); @@ -291,7 +291,7 @@ void FilterOptions::save() for (TQStringList::ConstIterator it = m_deletedProviders.begin(); it != m_deletedProviders.end(); ++it) { - TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); + TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); // Shouldn't happen if (!matches.count()) @@ -304,7 +304,7 @@ void FilterOptions::save() TQFile::remove(matches[0]); continue; } - KSimpleConfig service(path + *it + ".desktop"); + TDESimpleConfig service(path + *it + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); @@ -332,7 +332,7 @@ void FilterOptions::defaults() void FilterOptions::configChanged() { - // kdDebug () << "FilterOptions::configChanged: TRUE" << endl; + // kdDebug () << "FilterOptions::configChanged: true" << endl; emit changed(true); } diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index be82459b6..661a3abb0 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -32,7 +32,7 @@ class SearchProviderItem; class FilterOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index f6227b90f..f29678e15 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h index abf3fe255..add958f41 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h @@ -32,7 +32,7 @@ class TDEInstance; class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: KAutoWebSearch(TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index ae86c5836..a33f4e78b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -33,9 +33,9 @@ #include <kdebug.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprotocolinfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstaticdeleter.h> #include "kuriikwsfiltereng.h" @@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig() // contains the sycoca based search provider configuration (malte). // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time... { - KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc"); + TDESimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc"); oldConfig.setGroup("General"); if (oldConfig.hasKey("SearchEngines")) @@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig() delete provider; } - KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); + TDESimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); desktop.setGroup("Desktop Entry"); desktop.writeEntry("Type", "Service"); desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 78f84780c..fb816ef84 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index f72d38340..2f2284e5a 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -31,7 +31,7 @@ class TDEInstance; class KURISearchFilter : public KURIFilterPlugin, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: KURISearchFilter(TQObject *parent = 0, const char *name = 0, diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index a1f6ca619..bf295462f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -43,11 +43,11 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, enableButtonSeparator(true); - m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40); + m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40); - connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leShortcut, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); // Data init TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames(); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h index 2a23cbf05..a698ee626 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h @@ -27,7 +27,7 @@ class SearchProviderDlgUI; class SearchProviderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index c2e3af8fa..01e9b93b5 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -22,8 +22,8 @@ #include "localdomainurifilter.h" -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqregexp.h> @@ -84,8 +84,8 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const TDEProcess proc; proc << helper << host; - connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) ); + connect( &proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(receiveOutput(TDEProcess *, char *, int)) ); if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout )) return last_result = false; diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h index 9d0c5f26d..04274f601 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h @@ -41,7 +41,7 @@ class TDEProcess; class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: LocalDomainURIFilter( TQObject* parent, const char* name, const TQStringList& args ); diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp index cae4c5abb..28beeada0 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp @@ -32,7 +32,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kmimetype.h> @@ -379,7 +379,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -514,7 +514,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) + if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h index 1d48e7c2a..be2ba2fd9 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h @@ -40,7 +40,7 @@ class TDEInstance; class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 34a9404a4..05aa07174 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -28,7 +28,7 @@ #include <tdelocale.h> #include <knuminput.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <dcopref.h> @@ -80,11 +80,11 @@ static const int DFLT_OFF = 60; extern "C" { - KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { + TDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { return new KEnergy(parent, "kcmenergy"); } - KDE_EXPORT void init_energy() { + TDE_EXPORT void init_energy() { #ifdef HAVE_DPMS TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); cfg->setGroup("DisplayEnergy"); @@ -176,7 +176,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name) TDEGlobal::locale()->insertCatalogue("kpowersave"); // ### these i18n strings need to be synced with kpowersave !! m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this); - connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool))); + connect(m_pCBEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeEnable(bool))); hbox->addWidget(m_pCBEnable); TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the" @@ -198,7 +198,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name) logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png"))); logo->setTipText(i18n("Learn more about the Energy Star program")); logo->setUseTips(true); -connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &))); +connect(logo, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString &))); hbox->addStretch(); hbox->addWidget(logo); @@ -210,7 +210,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pStandbySlider->setRange(0, 120, 10); m_pStandbySlider->setSuffix(i18n(" min")); m_pStandbySlider->setSpecialValueText(i18n("Disabled")); - connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int))); + connect(m_pStandbySlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeStandby(int))); top->addWidget(m_pStandbySlider); TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity" " after which the display should enter \"standby\" mode. This is the" @@ -221,7 +221,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pSuspendSlider->setRange(0, 120, 10); m_pSuspendSlider->setSuffix(i18n(" min")); m_pSuspendSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int))); + connect(m_pSuspendSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeSuspend(int))); top->addWidget(m_pSuspendSlider); TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity" " after which the display should enter \"suspend\" mode. This is the" @@ -233,7 +233,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pOffSlider->setRange(0, 120, 10); m_pOffSlider->setSuffix(i18n(" min")); m_pOffSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int))); + connect(m_pOffSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeOff(int))); top->addWidget(m_pOffSlider); TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity" " after which the display should be powered off. This is the" @@ -247,13 +247,13 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons if(m_bKPowersave) { TQPushButton* btnKPowersave = new TQPushButton(this); btnKPowersave->setText(i18n("Configure KPowersave...")); - connect(btnKPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchKPowersave())); + connect(btnKPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchKPowersave())); top->addWidget(btnKPowersave); } if(m_bTDEPowersave) { TQPushButton* btnTDEPowersave = new TQPushButton(this); btnTDEPowersave->setText(i18n("Configure TDEPowersave...")); - connect(btnTDEPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchTDEPowersave())); + connect(btnTDEPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchTDEPowersave())); top->addWidget(btnTDEPowersave); } } diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h index d81810674..c49b12b9c 100644 --- a/kcontrol/energy/energy.h +++ b/kcontrol/energy/energy.h @@ -25,7 +25,7 @@ extern "C" void init_energy(); */ class KEnergy: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KEnergy(TQWidget *parent, const char *name); diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp index 5a0fd097b..ef46b8b8b 100644 --- a/kcontrol/filetypes/control.cpp +++ b/kcontrol/filetypes/control.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *) { return new FileTypesView(parent, "filetypes"); } diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index 7000a97e5..e9cb1fbf9 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -37,7 +37,7 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) // The order of those two items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); - connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); + connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) )); TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file belonging to this group. Konqueror can display the file in" diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h index 6563c5ed1..e5eb2d225 100644 --- a/kcontrol/filetypes/filegroupdetails.h +++ b/kcontrol/filetypes/filegroupdetails.h @@ -28,7 +28,7 @@ class TQButtonGroup; */ class FileGroupDetails : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FileGroupDetails(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index c4f3ce7bb..7928cef73 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -30,7 +30,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) iconButton = new TDEIconButton(firstWidget); iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType); - connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString))); + connect(iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(updateIcon(TQString))); iconButton->setFixedSize(70, 70); hBox->addWidget(iconButton); @@ -46,7 +46,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) grid->addRowSpacing(0, fontMetrics().lineSpacing()); extensionLB = new TQListBox(gb); - connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int))); + connect(extensionLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableExtButtons(int))); grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0); grid->setRowStretch(0, 0); grid->setRowStretch(1, 1); @@ -59,16 +59,16 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) addExtButton = new TQPushButton(i18n("Add..."), gb); addExtButton->setEnabled(false); - connect(addExtButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addExtension())); + connect(addExtButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addExtension())); grid->addWidget(addExtButton, 1, 1); TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") ); removeExtButton = new TQPushButton(i18n("Remove"), gb); removeExtButton->setEnabled(false); - connect(removeExtButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeExtension())); + connect(removeExtButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeExtension())); grid->addWidget(removeExtButton, 2, 1); TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") ); @@ -76,10 +76,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) gb = new TQGroupBox(i18n("Description"), firstWidget); firstLayout->addWidget(gb); - gb->setColumnLayout(1, Qt::Horizontal); + gb->setColumnLayout(1, TQt::Horizontal); description = new KLineEdit(gb); - connect(description, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(updateDescription(const TQString &))); + connect(description, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(updateDescription(const TQString &))); wtstr = i18n("You can enter a short description for files of the selected" " file type (e.g. 'HTML Page'). This description will be used by applications" @@ -88,7 +88,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) TQWhatsThis::add( description, wtstr ); serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget ); - connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect( serviceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); firstLayout->addWidget(serviceListWidget, 5); // Second tab - Embedding @@ -106,10 +106,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed ); - connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); + connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) )); m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed); - connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) )); + connect(m_chkAskSave, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAskSaveToggled(bool) )); TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file of this type. Konqueror can display the file in" @@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); - connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect( embedServiceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); addTab( firstWidget, i18n("&General") ); diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index 936e1c535..23c8c63b6 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -20,7 +20,7 @@ class KServiceListWidget; */ class FileTypeDetails : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: FileTypeDetails(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 58bbbbd09..e414014fe 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -11,12 +11,12 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kipc.h> #include <klineedit.h> #include <tdelistview.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "newtypedlg.h" #include "filetypedetails.h" @@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) leftLayout->setSpacing( KDialog::spacingHint() ); leftLayout->setColStretch(1, 1); - l->addLayout( TQT_TQLAYOUT(leftLayout) ); + l->addLayout( leftLayout ); TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this); leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2); @@ -66,8 +66,8 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) patternFilterLBL->setBuddy( patternFilterLE ); leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2); - connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotFilter(const TQString &))); + connect(patternFilterLE, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotFilter(const TQString &))); wtstr = i18n("Enter a part of a filename pattern. Only file types with a " "matching file pattern will appear in the list."); @@ -81,10 +81,10 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) typesLV->addColumn(i18n("Known Types")); leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2); - connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(updateDisplay(TQListViewItem *))); - connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(typesLV, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(updateDisplay(TQListViewItem *))); + connect(typesLV, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem *))); TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of" " the file types which are known on your system. Click on the '+' sign" @@ -93,13 +93,13 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) " file type using the controls on the right.") ); TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this); - connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType())); + connect(addTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(addType())); leftLayout->addWidget(addTypeB, 3, 0); TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") ); m_removeTypeB = new TQPushButton(i18n("&Remove"), this); - connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType())); + connect(m_removeTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(removeType())); leftLayout->addWidget(m_removeTypeB, 3, 2); m_removeTypeB->setEnabled(false); @@ -112,16 +112,16 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) // File Type Details m_details = new FileTypeDetails( m_widgetStack ); - connect( m_details, TQT_SIGNAL( changed(bool) ), - this, TQT_SLOT( setDirty(bool) ) ); - connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ), - this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &))); + connect( m_details, TQ_SIGNAL( changed(bool) ), + this, TQ_SLOT( setDirty(bool) ) ); + connect( m_details, TQ_SIGNAL( embedMajor(const TQString &, bool &) ), + this, TQ_SLOT( slotEmbedMajor(const TQString &, bool &))); m_widgetStack->addWidget( m_details, 1 /*id*/ ); // File Group Details m_groupDetails = new FileGroupDetails( m_widgetStack ); - connect( m_groupDetails, TQT_SIGNAL( changed(bool) ), - this, TQT_SLOT( setDirty(bool) ) ); + connect( m_groupDetails, TQ_SIGNAL( changed(bool) ), + this, TQ_SLOT( setDirty(bool) ) ); m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ ); // Widget shown on startup @@ -132,9 +132,9 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) m_widgetStack->raiseWidget( m_emptyWidget ); - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); // this takes some time - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) ); } FileTypesView::~FileTypesView() @@ -362,7 +362,7 @@ bool FileTypesView::sync( TQValueList<TypesListItem *>& itemsModified ) loc = m_ptr->desktopEntryPath(); loc = locateLocal("mime", loc); - KDesktopFile config(loc, false, "mime"); + TDEDesktopFile config(loc, false, "mime"); config.writeEntry("Type", "MimeType"); config.writeEntry("MimeType", m_ptr->name()); config.writeEntry("Hidden", true); diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index 16e7bff3e..2c684ca4c 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -23,7 +23,7 @@ class TQWidgetStack; class FileTypesView : public TDECModule { - Q_OBJECT + TQ_OBJECT public: FileTypesView(TQWidget *p = 0, const char *name = 0); ~FileTypesView(); diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 19aa01a59..b78886ef7 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <tdecmdlineargs.h> #include <tdesycoca.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xutil.h> #endif @@ -58,11 +58,11 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem ) // This code is very similar to kcdialog.cpp setMainWidget( m_details ); - connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(m_details, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); // TODO setHelp() enableButton(Apply, false); - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) ); } void FileTypeDialog::save() @@ -159,7 +159,7 @@ int main(int argc, char ** argv) } FileTypeDialog dlg( mime, createType ); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( args->isSet( "parent" )) { bool ok; long id = args->getOption("parent").toLong(&ok); diff --git a/kcontrol/filetypes/keditfiletype.h b/kcontrol/filetypes/keditfiletype.h index 3ae7c0e35..f4abc8d3a 100644 --- a/kcontrol/filetypes/keditfiletype.h +++ b/kcontrol/filetypes/keditfiletype.h @@ -27,7 +27,7 @@ class FileTypeDetails; // A dialog for ONE file type to be edited. class FileTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FileTypeDialog( KMimeType::Ptr mime ); FileTypeDialog( KMimeType::Ptr mime, bool newItem ); diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index d0463d7ad..bc8555634 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/kcontrol/filetypes/kservicelistwidget.cpp @@ -35,7 +35,7 @@ #include "kserviceselectdlg.h" #include "typeslistitem.h" #include <kpropertiesdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KServiceListItem::KServiceListItem( KService *pService, int kind ) : TQListBoxText(), desktopPath(pService->desktopEntryPath()) @@ -74,9 +74,9 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n grid->setRowStretch(6, 1); servicesLB = new TQListBox(gb); - connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(servicesLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0); - connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService())); + connect( servicesLB, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQ_SLOT( editService())); TQString wtstr = (kind == SERVICELIST_APPLICATIONS ? @@ -96,7 +96,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(promoteService())); grid->addWidget(servUpButton, 2, 1); TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ? @@ -109,7 +109,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(demoteService())); grid->addWidget(servDownButton, 3, 1); TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ? @@ -122,7 +122,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servNewButton = new TQPushButton(i18n("Add..."), gb); servNewButton->setEnabled(false); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addService())); grid->addWidget(servNewButton, 1, 1); TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) ); @@ -130,7 +130,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servEditButton = new TQPushButton(i18n("Edit..."), gb); servEditButton->setEnabled(false); - connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService())); + connect(servEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(editService())); grid->addWidget(servEditButton, 4, 1); TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) ); @@ -138,7 +138,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servRemoveButton = new TQPushButton(i18n("Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeService())); grid->addWidget(servRemoveButton, 5, 1); TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) ); diff --git a/kcontrol/filetypes/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h index 0e4a3e3a3..5c16fa07f 100644 --- a/kcontrol/filetypes/kservicelistwidget.h +++ b/kcontrol/filetypes/kservicelistwidget.h @@ -45,7 +45,7 @@ public: */ class KServiceListWidget : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: enum { SERVICELIST_APPLICATIONS, SERVICELIST_SERVICES }; KServiceListWidget(int kind, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index f8c4f0dd4..e9618683d 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS m_listbox->sort(); m_listbox->setMinimumHeight(350); m_listbox->setMinimumWidth(300); - connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk())); + connect(m_listbox,TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotOk())); setMainWidget(vbox); } diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h index 3b3ea87e7..3365fbffe 100644 --- a/kcontrol/filetypes/kserviceselectdlg.h +++ b/kcontrol/filetypes/kserviceselectdlg.h @@ -23,7 +23,7 @@ class KServiceSelectDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog to select a service (not application) for a given service type. diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index dbb37344c..e2a9b28a7 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups, TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - topl->addLayout(TQT_TQLAYOUT(grid)); + topl->addLayout(grid); TQLabel *l = new TQLabel(i18n("Group:"), main); grid->addWidget(l, 0, 0); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 63d65e4ec..1c5d8b6f7 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -20,8 +20,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <kstandarddirs.h> -#include <kdesktopfile.h> +#include <tdestandarddirs.h> +#include <tdedesktopfile.h> #include <kstaticdeleter.h> #include "typeslistitem.h" diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 7239b62ac..6236ad49f 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -28,9 +28,9 @@ #include <kipc.h> #include <tdemessagebox.h> #include <knuminput.h> -#include <kprocio.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdeprocio.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <stdlib.h> #ifdef HAVE_FREETYPE2 @@ -186,7 +186,7 @@ void FontUseItem::writeFont() config->setGroup(_rcgroup); config->writeEntry(_rckey, font(), true, true); } else { - config = new KSimpleConfig(locateLocal("config", _rcfile)); + config = new TDESimpleConfig(locateLocal("config", _rcfile)); config->setGroup(_rcgroup); config->writeEntry(_rckey, font()); config->sync(); @@ -270,13 +270,13 @@ FontAASettings::FontAASettings(TQWidget *parent) enableWidgets(); setMainWidget(mw); - connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(excludeRange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useSubPixel, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(excludeFrom, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(excludeTo, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(subPixelType, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #ifdef HAVE_FONTCONFIG - connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(hintingStyle, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #endif } @@ -596,7 +596,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) ); fontUseList.append(i); - connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected())); + connect(i, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(fontSelected())); TQLabel * fontUse = new TQLabel(name+":", this); TQWhatsThis::add(fontUse, *quickHelpIt++); @@ -612,7 +612,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this); TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); hblay->addWidget( fontAdjustButton ); - connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff())); + connect(fontAdjustButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyFontDiff())); layout->addSpacing(KDialog::spacingHint()); @@ -627,11 +627,11 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQWhatsThis::add(cbAA, i18n("If this option is selected, TDE will smooth the edges of curves in " "fonts.")); aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this); - connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa())); + connect(aaSettingsButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCfgAa())); label->setBuddy( cbAA ); lay->addWidget( cbAA, 0, 1 ); lay->addWidget( aaSettingsButton, 0, 2 ); - connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing())); + connect(cbAA, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseAntiAliasing())); label = new TQLabel( i18n( "Force fonts DPI:" ), this ); lay->addWidget( label, 1, 0 ); @@ -645,10 +645,10 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) " is also often misused when poor quality fonts are used that do not" " look well with DPI values other than 96 or 120 DPI.</p>"); TQWhatsThis::add(comboForceDpi, whatsthis); - connect(comboForceDpi, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseFontDPI())); + connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI())); sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this); TQWhatsThis::add(sbDpiValue, whatsthis); - connect(sbDpiValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); lay->addWidget( comboForceDpi, 1, 1 ); lay->addWidget( sbDpiValue, 1, 2 ); @@ -736,7 +736,7 @@ void TDEFonts::save() // otherwise don't explicitly remove it and leave any possible system-wide value if(dpi == DPINone) { - KProcIO proc; + TDEProcIO proc; proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; proc.writeStdin( TQCString( "Xft.dpi" ), true ); proc.closeWhenDone(); @@ -744,7 +744,7 @@ void TDEFonts::save() } // KDE-1.x support - KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); + TDESimpleConfig* config = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) { if("font"==i->rcKey()) @@ -757,7 +757,7 @@ void TDEFonts::save() KIPC::sendMessageAll(KIPC::FontChanged); - kapp->processEvents(); // Process font change ourselves + tdeApp->processEvents(); // Process font change ourselves bool aaSave = false; // Don't overwrite global settings unless explicitly asked for - e.g. the system diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index 3d1e9643a..c8b3f9919 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -25,7 +25,7 @@ class FontAASettings; class FontUseItem : public TDEFontRequester { - Q_OBJECT + TQ_OBJECT public: FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp, @@ -50,7 +50,7 @@ private: class FontAASettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ private: */ class TDEFonts : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TDEFonts(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp index b0f0e1cd8..eb9d23090 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.cpp +++ b/kcontrol/hwmanager/cryptpassworddlg.cpp @@ -31,7 +31,7 @@ #include <tqpainter.h> #include <tqstyle.h> #include <tqfile.h> -#include <tqinternal_p.h> +#include <private/tqinternal_p.h> #undef Unsorted // Required for --enable-final (tqdir.h) #include <tqfiledialog.h> @@ -73,11 +73,11 @@ CryptPasswordDialog::CryptPasswordDialog(TQWidget *parent, TQString passwordProm } } - connect(m_base->textPasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->cardKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->textPasswordEntry, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); + connect(m_base->textPasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->cardKeyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->textPasswordEntry, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); m_base->textPasswordEntry->setFocus(); diff --git a/kcontrol/hwmanager/cryptpassworddlg.h b/kcontrol/hwmanager/cryptpassworddlg.h index d595c4a73..f155df968 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.h +++ b/kcontrol/hwmanager/cryptpassworddlg.h @@ -35,7 +35,7 @@ class KSSLCertificate; class TDEUI_EXPORT CryptPasswordDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog that allows a user to enter LUKS passwords or password files diff --git a/kcontrol/hwmanager/cryptpassworddlgbase.ui b/kcontrol/hwmanager/cryptpassworddlgbase.ui index f7a6a70a7..2c3a425a8 100644 --- a/kcontrol/hwmanager/cryptpassworddlgbase.ui +++ b/kcontrol/hwmanager/cryptpassworddlgbase.ui @@ -137,9 +137,9 @@ <includes> <include location="local" impldecl="in implementation">CryptPasswordDialogBase.ui.h</include> </includes> - <Q_SLOTS> + <slots> <slot>enableSupport_toggled(bool)</slot> - </Q_SLOTS> + </slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kpassdlg.h</include> diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index 44a71b3a3..3ad111378 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> #include <tdemessagebox.h> @@ -43,8 +43,8 @@ DeviceIconView::DeviceIconView(TQWidget * parent, const char * name) header()->hide(); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); } void DeviceIconView::slotItemSelected(TQListViewItem* item) diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h index 746fb2253..6460beb0a 100644 --- a/kcontrol/hwmanager/deviceiconview.h +++ b/kcontrol/hwmanager/deviceiconview.h @@ -55,7 +55,7 @@ private: class DeviceIconView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DeviceIconView(TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 89a7e867f..5770c8d97 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -28,8 +28,8 @@ #include <tqslider.h> #include <tqpainter.h> #include <tqstyle.h> -#include <tqinternal_p.h> -#include <kprocess.h> +#include <private/tqinternal_p.h> +#include <tdeprocess.h> #include <dcopclient.h> #include <dcopref.h> #undef Unsorted // Required for --enable-final (tqdir.h) @@ -299,20 +299,20 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge } if (m_device->type() == TDEGenericDeviceType::CPU) { - connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &))); + connect(base->comboCPUGovernor, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setCPUGovernor(const TQString &))); } if (m_device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device); - connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk())); - connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk())); - connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk())); - connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk())); - connect(base->buttonDiskEject, TQT_SIGNAL(clicked()), this, TQT_SLOT(ejectDisk())); - connect(base->buttonDiskSafeRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(safeRemoveDisk())); + connect(base->buttonDiskMount, TQ_SIGNAL(clicked()), this, TQ_SLOT(mountDisk())); + connect(base->buttonDiskUnmount, TQ_SIGNAL(clicked()), this, TQ_SLOT(unmountDisk())); + connect(base->buttonDiskUnlock, TQ_SIGNAL(clicked()), this, TQ_SLOT(unlockDisk())); + connect(base->buttonDiskLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(lockDisk())); + connect(base->buttonDiskEject, TQ_SIGNAL(clicked()), this, TQ_SLOT(ejectDisk())); + connect(base->buttonDiskSafeRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(safeRemoveDisk())); if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) { - connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey())); - connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey())); - connect(base->cryptLUKSKeySlotList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processLockouts())); + connect(base->cryptLUKSAddKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSAddKey())); + connect(base->cryptLUKSDelKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSDelKey())); + connect(base->cryptLUKSKeySlotList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(processLockouts())); base->cryptLUKSKeySlotList->setAllColumnsShowFocus(true); base->cryptLUKSKeySlotList->setFullWidth(true); cryptLUKSPopulateList(); @@ -332,10 +332,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge m_sensorDataGridWidgets.setAutoDelete(true); } if (m_device->type() == TDEGenericDeviceType::Backlight) { - connect(base->sliderBacklightBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setBacklightBrightness(int))); + connect(base->sliderBacklightBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setBacklightBrightness(int))); } if (m_device->type() == TDEGenericDeviceType::RootSystem) { - connect(base->comboSystemHibernationMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHibernationMethod(int))); + connect(base->comboSystemHibernationMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHibernationMethod(int))); } TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint()); @@ -345,8 +345,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(processHardwareRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareUpdated(TDEGenericDevice*))); populateDeviceInformation(); } @@ -493,9 +493,6 @@ void DevicePropertiesDialog::populateDeviceInformation() if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) { status_text += i18n("Contains a filesystem") + "<br>"; } - if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { - status_text += i18n("Hotpluggable") + "<br>"; - } if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) { status_text += i18n("Hidden") + "<br>"; } @@ -537,8 +534,7 @@ void DevicePropertiesDialog::populateDeviceInformation() showGroup = true; } if (isMonitoredDevice(sdevice) && - (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) || - sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable))) + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { base->buttonDiskEject->setEnabled(true); base->buttonDiskSafeRemove->setEnabled(true); @@ -885,8 +881,8 @@ void DevicePropertiesDialog::populateDeviceInformation() if (m_device->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device); - connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted())); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved())); + connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted())); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved())); updateCryptographicCardStatusDisplay(); } diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h index aabda590f..e961e689f 100644 --- a/kcontrol/hwmanager/devicepropsdlg.h +++ b/kcontrol/hwmanager/devicepropsdlg.h @@ -37,7 +37,7 @@ class PasswordDlg; class TDEUI_EXPORT SensorDisplayLabelsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Create a simple sensor name and value display widget @@ -65,7 +65,7 @@ private: class TDEUI_EXPORT SensorBar : public TQProgressBar { - Q_OBJECT + TQ_OBJECT public: SensorBar(TQWidget* parent=0, const char* name=0, WFlags f=0) : TQProgressBar(parent, name, f) {} SensorBar(int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0): TQProgressBar(totalSteps, parent, name, f) {} @@ -93,7 +93,7 @@ public: class TDEUI_EXPORT SensorDisplayWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Simple sensor information display widget @@ -167,7 +167,7 @@ typedef TQMap<TDESystemHibernationMethod::TDESystemHibernationMethod, int> Hiber class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog that allows a user to view and edit hardware device properties diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index e7d7cee22..dce403fe7 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -1759,9 +1759,9 @@ <includes> <include location="local" impldecl="in implementation">DevicePropertiesDialogBase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 509fe2835..f1726a2a1 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -1,8 +1,8 @@ /* * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net> - * + * * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application - * + * * hwdevicetray is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 @@ -21,58 +21,144 @@ #include <config.h> #endif -#include <tqtimer.h> +#include <cstdlib> +#include <unistd.h> + +#include <tqfileinfo.h> #include <tqimage.h> +#include <tqtimer.h> #include <tqtooltip.h> -#include <tqfileinfo.h> +#include <tqvaluevector.h> +#include <kcmultidialog.h> +#include <tdeglobalaccel.h> +#include <khelpmenu.h> +#include "tdeprocess.h" +#include <kpropertiesdialog.h> #include <krun.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> + #include <tdeaction.h> #include <tdeapplication.h> -#include <kcmultidialog.h> -#include <kdebug.h> -#include <khelpmenu.h> -#include <kiconloader.h> -#include "kprocess.h" -#include <tdelocale.h> -#include <tdepopupmenu.h> -#include <kstdaction.h> -#include <kstdguiitem.h> #include <tdeglobal.h> +#include <tdehardwaredevices.h> +#include <tdelocale.h> #include <tdemessagebox.h> -#include <kpassivepopup.h> -#include <kstandarddirs.h> -#include <kpropertiesdialog.h> -#include "passworddlg.h" +#include "tdepassivepopupstack.h" +#include <tdepopupmenu.h> #include <dcopclient.h> #include <dcopref.h> -#include <cstdlib> -#include <unistd.h> - -#include "hwdevicetray_configdialog.h" #include "hwdevicetray.h" +#include "hwdevicetray_configdialog.h" -HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) - : KSystemTray(parent, name) + +// Storage Device Action +namespace SDActions +{ + // use 'int' as underlying type to avoid exposing a bunch of unnecessary + // enums/structs in the class header file private methods' signature + // Note: must start from 0 because the Type value is also used as index + // of a TQValueVector + enum Type : int + { + Open = 0, + Mount, + Unmount, + Unlock, + Lock, + Eject, + SafeRemove, + Properties + }; + + struct Details + { + const char *iconName; + const char *actionName; + const char *collectionName; + }; + + // Allows to use a for loop to iterate over all action types + static const Type All[] = { Open, Mount, Unmount, Unlock, Lock, Eject, SafeRemove, Properties }; + + static const TQMap<Type, Details> populateMap() + { + TQMap<Type, Details> map; + map[Open] = { "window-new", I18N_NOOP("Open"), "open_menu" }; + map[Mount] = { "drive-harddisk-mounted", I18N_NOOP("Mount"), "mount_menu" }; + map[Unmount] = { "drive-harddisk-unmounted", I18N_NOOP("Unmount"), "unmount_menu" }; + map[Unlock] = { "decrypted", I18N_NOOP("Unlock"), "unlock_menu" }; + map[Lock] = { "encrypted", I18N_NOOP("Lock"), "lock_menu" }; + map[Eject] = { "player_eject", I18N_NOOP("Eject"), "eject_menu" }; + map[SafeRemove] = { "player_safe_removal", I18N_NOOP("Safe remove"), "safe_remove_menu" }; + map[Properties] = { "edit", I18N_NOOP("Properties"), "properties_menu" }; + return map; + } + + static const TQMap<Type, Details> Data = populateMap(); +} + +// Storage Device Action Menu Entry, representing an action +// and the storage device on which to perform it +struct SDActionMenuEntry +{ + SDActions::Type actionType; + TQString uuid; +}; + +struct KnownDiskDeviceInfo +{ + TQString deviceLabel; + TQString node; +}; + + +class HwDeviceSystemTrayPrivate +{ +public: + HwDeviceSystemTrayPrivate() + { + } + + ~HwDeviceSystemTrayPrivate() + { + } + + // Members + TDEAction *m_deviceManagerAction; + TDEAction *m_quitAction; + TDEAction *m_shortcutKeysAction; + KHelpMenu *m_helpMenu; + TDEPopupMenu *m_LMBMenu; + TDEPopupMenu *m_RMBMenu; + + TQMap<int, SDActionMenuEntry> m_actionMenuEntryMap; + TQMap<SDActions::Type, TDEActionMenu*> m_RMBActionMenuMap; + + TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices; + + TDEPassivePopupStackContainer *m_hardwareNotifierContainer; +}; + + +HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) + : KSystemTray(parent, name), d(new HwDeviceSystemTrayPrivate()) { // Create notifier - m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); - connect(m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); + d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); + connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); - // Create help submenu - m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); - TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + initMenus(); setPixmap(KSystemTray::loadIcon("hwinfo")); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp())); TQToolTip::add(this, i18n("Device monitor")); - m_parent = parent; - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "hwdevicetray_bindings.cpp" // the keys need to be read from tdeglobals, not kickerrc @@ -80,42 +166,35 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - - new TDEActionMenu(i18n("Open"), SmallIcon("window-new", TQIconSet::Automatic), actionCollection(), "open_menu"); - new TDEActionMenu(i18n("Mount"), SmallIcon("drive-harddisk-mounted", TQIconSet::Automatic), actionCollection(), "mount_menu"); - new TDEActionMenu(i18n("Unmount"), SmallIcon("drive-harddisk-unmounted", TQIconSet::Automatic), actionCollection(), "unmount_menu"); - new TDEActionMenu(i18n("Unlock"), SmallIcon("decrypted", TQIconSet::Automatic), actionCollection(), "unlock_menu"); - new TDEActionMenu(i18n("Lock"), SmallIcon("encrypted", TQIconSet::Automatic), actionCollection(), "lock_menu"); - new TDEActionMenu(i18n("Eject"), SmallIcon("player_eject", TQIconSet::Automatic), actionCollection(), "eject_menu"); - new TDEActionMenu(i18n("Safe remove"), SmallIcon("player_safe_removal", TQIconSet::Automatic), actionCollection(), "safe_remove_menu"); - new TDEActionMenu(i18n("Properties"), SmallIcon("edit", TQIconSet::Automatic), actionCollection(), "properties_menu"); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); doDiskNotifications(true); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(deviceAdded(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(deviceRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); } HwDeviceSystemTray::~HwDeviceSystemTray() { - delete m_hardwareNotifierContainer; + delete d->m_hardwareNotifierContainer; + delete d; } /*! - * \b TQT_SLOT which called if hwdevicetray is exited by the user. In this case the user + * \b TQ_SLOT which called if hwdevicetray is exited by the user. In this case the user * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the * result is written to the KDE configfile. */ -void HwDeviceSystemTray::_quit () { - r_config = new KSimpleConfig("tdehwdevicetrayrc"); +void HwDeviceSystemTray::quitApp() +{ + TDESimpleConfig *config = new TDESimpleConfig("tdehwdevicetrayrc"); - TQString tmp1 = i18n ("Start device monitor automatically when you log in?"); - int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); - r_config->setGroup("General"); - r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes); - r_config->sync (); + TQString tmp1 = i18n("Start device monitor automatically when you log in?"); + int tmp2 = KMessageBox::questionYesNo(0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); + config->setGroup("General"); + config->writeEntry("Autostart", tmp2 == KMessageBox::Yes); + config->sync(); exit(0); } @@ -142,16 +221,28 @@ void HwDeviceSystemTray::showEvent (TQShowEvent *) { resizeTrayIcon(); } -void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) { - // Popup the context menu with left-click - if (e->button() == Qt::LeftButton) { - contextMenuAboutToShow(contextMenu()); - contextMenu()->popup(e->globalPos()); - e->accept(); - return; +void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) +{ + switch (e->button()) + { + case TQt::LeftButton: + populateLMBMenu(); + d->m_LMBMenu->popup(e->globalPos()); + break; + + case TQt::MidButton: + TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig())); + break; + + case TQt::RightButton: + contextMenuAboutToShow(d->m_RMBMenu); + d->m_RMBMenu->popup(e->globalPos()); + break; + + default: + // do nothing + break; } - - KSystemTray::mousePressEvent(e); } bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice) @@ -195,107 +286,128 @@ bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice) sdevice->isDiskOfType(TDEDiskDeviceType::Camera))); } -void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) { - menu->clear(); - menu->setCheckable(true); +void HwDeviceSystemTray::initMenus() +{ + // RMB menu + d->m_RMBMenu = contextMenu(); - populateMenu(menu); + // Device actions + for (const SDActions::Type &actionType : SDActions::All) + { + SDActions::Details ad = SDActions::Data[actionType]; + d->m_RMBActionMenuMap.insert(actionType, new TDEActionMenu(i18n(ad.actionName), + SmallIcon(ad.iconName, TQIconSet::Automatic), actionCollection(), ad.collectionName)); + } - menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration")); + // Global Configuration + d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), + TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection()); + d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection()); - TDEAction *actHardwareConfig = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection()); - actHardwareConfig->plug(menu); + // Help & Quit + d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); + d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); + d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); - TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection()); - actShortcutKeys->plug(menu); + // LMB menu + d->m_LMBMenu = new TDEPopupMenu(this); +} - menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), m_help->menu()); - TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); - quitAction->plug(menu); +TQString HwDeviceSystemTray::getDeviceLabel(TDEStorageDevice *sdevice) +{ + if (!sdevice) + { + return TQString::null; + } + + DCOPRef mediamanager("kded", "mediamanager"); + DCOPReply reply = mediamanager.call("properties", sdevice->deviceNode()); + TQString deviceLabel = TQString::null; + if (reply.isValid()) + { + // TODO R14.2.0: make sure the reply is a valid Medium + // once the media library is part of tdelibs + TQStringList properties = reply; + if (properties.size() >= 4) + { + deviceLabel = properties[3]; // medium label + } + } + + if (deviceLabel.isEmpty()) + { + deviceLabel = !sdevice->diskLabel().isEmpty() ? sdevice->diskLabel() : sdevice->friendlyName(); + deviceLabel += " (" + sdevice->deviceNode() + ")"; + } - m_menu = menu; + return deviceLabel; } -void HwDeviceSystemTray::configChanged() { - // +void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, + TDEActionMenu *actionMenu, int &actionMenuIdx) +{ + TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath(); + SDActions::Type actionType = (SDActions::Type)type; + SDActions::Details ad = SDActions::Data[actionType]; + actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx); + actionMenu->popupMenu()->connectItem(actionMenuIdx, this, + TQ_SLOT(slotExecuteDeviceAction(int))); + d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; } -void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) { - menu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices")); - - TDEActionMenu *openDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("open_menu")); - TDEActionMenu *mountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("mount_menu")); - TDEActionMenu *unmountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unmount_menu")); - TDEActionMenu *unlockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unlock_menu")); - TDEActionMenu *lockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("lock_menu")); - TDEActionMenu *ejectDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("eject_menu")); - TDEActionMenu *safeRemoveDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("safe_remove_menu")); - TDEActionMenu *propertiesDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("properties_menu")); - - openDeviceActionMenu->popupMenu()->clear(); - mountDeviceActionMenu->popupMenu()->clear(); - unmountDeviceActionMenu->popupMenu()->clear(); - unlockDeviceActionMenu->popupMenu()->clear(); - lockDeviceActionMenu->popupMenu()->clear(); - ejectDeviceActionMenu->popupMenu()->clear(); - safeRemoveDeviceActionMenu->popupMenu()->clear(); - propertiesDeviceActionMenu->popupMenu()->clear(); - - m_openMenuIndexMap.clear(); - m_mountMenuIndexMap.clear(); - m_unmountMenuIndexMap.clear(); - m_unlockMenuIndexMap.clear(); - m_lockMenuIndexMap.clear(); - m_ejectMenuIndexMap.clear(); - m_safeRemoveMenuIndexMap.clear(); - m_propertiesMenuIndexMap.clear(); +void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx) +{ + TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath(); + SDActions::Type actionType = (SDActions::Type)type; + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall), + getDeviceLabel(sdevice), actionMenuIdx); + actionMenu->popupMenu()->connectItem(actionMenuIdx, this, + TQ_SLOT(slotExecuteDeviceAction(int))); + actionMenu->setEnabled(true); + d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; +} - // Find all storage devices and add them to the popup menus - int lastOpenIndex = -1; - int lastMountIndex = -1; - int lastUnmountIndex = -1; - int lastUnlockIndex = -1; - int lastLockIndex = -1; - int lastEjectIndex = -1; - int lastSafeRemoveIndex = -1; - int lastPropertiesIndex = -1; +void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) +{ + d->m_RMBMenu = menu; + menu->clear(); + for (const SDActions::Type &actionType : SDActions::All) + { + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + actionMenu->popupMenu()->clear(); + actionMenu->setEnabled(false); + actionMenu->unplug(d->m_RMBMenu); + } + + d->m_actionMenuEntryMap.clear(); + + // Find all storage devices, sort them by label and add them to the popup menus + TQValueVector<TQMap<TQString, TDEStorageDevice*>*> rmbMenuEntries(sizeof(SDActions::All) / sizeof(SDActions::Type), nullptr); + for (size_t idx = 0; idx < rmbMenuEntries.size(); ++idx) + { + rmbMenuEntries[idx] = new TQMap<TQString, TDEStorageDevice*>(); + } TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); + TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); if (isMonitoredDevice(sdevice)) { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - - if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) + TQString deviceLabel = getDeviceLabel(sdevice); + if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt)) { - lastLockIndex = lockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - lockDeviceActionMenu->popupMenu()->connectItem(lastLockIndex, this, TQT_SLOT(slotLockDevice(int))); - m_lockMenuIndexMap[lastLockIndex] = sdevice->diskUUID(); - if (m_lockMenuIndexMap[lastLockIndex] == "") - { - m_lockMenuIndexMap[lastLockIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Lock])[deviceLabel] = sdevice; } else { - lastUnlockIndex = unlockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - unlockDeviceActionMenu->popupMenu()->connectItem(lastUnlockIndex, this, TQT_SLOT(slotUnlockDevice(int))); - m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->diskUUID(); - if (m_unlockMenuIndexMap[lastUnlockIndex] == "") - { - m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Unlock])[deviceLabel] = sdevice; } } @@ -303,245 +415,135 @@ void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) { { if (sdevice->mountPath().isEmpty()) { - lastMountIndex = mountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - mountDeviceActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int))); - m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID(); - if (m_mountMenuIndexMap[lastMountIndex] == "") - { - m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Mount])[deviceLabel] = sdevice; } else { - lastUnmountIndex = unmountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - unmountDeviceActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int))); - m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID(); - if (m_unmountMenuIndexMap[lastMountIndex] == "") - { - m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Unmount])[deviceLabel] = sdevice; } - // Both mounted and unmounted disks can be opened - lastOpenIndex = openDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - openDeviceActionMenu->popupMenu()->connectItem(lastOpenIndex, this, TQT_SLOT(slotOpenDevice(int))); - m_openMenuIndexMap[lastOpenIndex] = sdevice->diskUUID(); - if (m_openMenuIndexMap[lastOpenIndex] == "") - { - m_openMenuIndexMap[lastOpenIndex] = sdevice->systemPath(); - } + // Mounted and unmounted disks can also be opened + (*rmbMenuEntries[SDActions::Open])[deviceLabel] = sdevice; } - if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) || - sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { - lastEjectIndex = ejectDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - ejectDeviceActionMenu->popupMenu()->connectItem(lastEjectIndex, this, TQT_SLOT(slotEjectDevice(int))); - m_ejectMenuIndexMap[lastEjectIndex] = sdevice->diskUUID(); - if (m_ejectMenuIndexMap[lastEjectIndex] == "") - { - m_ejectMenuIndexMap[lastEjectIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Eject])[deviceLabel] = sdevice; - lastSafeRemoveIndex = safeRemoveDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - safeRemoveDeviceActionMenu->popupMenu()->connectItem(lastSafeRemoveIndex, this, TQT_SLOT(slotSafeRemoveDevice(int))); - m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->diskUUID(); - if (m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] == "") - { - m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::SafeRemove])[deviceLabel] = sdevice; } - lastPropertiesIndex = propertiesDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - propertiesDeviceActionMenu->popupMenu()->connectItem(lastPropertiesIndex, this, TQT_SLOT(slotPropertiesDevice(int))); - m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->diskUUID(); - if (m_propertiesMenuIndexMap[lastPropertiesIndex] == "") - { - m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Properties])[deviceLabel] = sdevice; } } - openDeviceActionMenu->setEnabled(lastOpenIndex != -1); - mountDeviceActionMenu->setEnabled(lastMountIndex != -1); - unmountDeviceActionMenu->setEnabled(lastUnmountIndex != -1); - unlockDeviceActionMenu->setEnabled(lastUnlockIndex != -1); - lockDeviceActionMenu->setEnabled(lastLockIndex != -1); - ejectDeviceActionMenu->setEnabled(lastEjectIndex != -1); - safeRemoveDeviceActionMenu->setEnabled(lastSafeRemoveIndex != -1); - propertiesDeviceActionMenu->setEnabled(lastPropertiesIndex != -1); - - if (lastOpenIndex != -1) - { - openDeviceActionMenu->plug(menu); - } - if (lastMountIndex != -1) - { - mountDeviceActionMenu->plug(menu); - } - if (lastUnmountIndex != -1) - { - unmountDeviceActionMenu->plug(menu); - } - if (lastUnlockIndex != -1) - { - unlockDeviceActionMenu->plug(menu); - } - if (lastLockIndex != -1) - { - lockDeviceActionMenu->plug(menu); - } - if (lastEjectIndex != -1) - { - ejectDeviceActionMenu->plug(menu); - } - if (lastSafeRemoveIndex != -1) - { - safeRemoveDeviceActionMenu->plug(menu); - } - if (lastPropertiesIndex != -1) + // Plug in meaningful action menus + d->m_RMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Device Actions"), 0); + int actionMenuIdx = 0; + for (const SDActions::Type &actionType : SDActions::All) { - propertiesDeviceActionMenu->plug(menu); + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + for (TDEStorageDevice *sdevice : *rmbMenuEntries[actionType]) + { + addDeviceToRMBMenu(sdevice, actionType, actionMenuIdx); + } + if (actionMenu->isEnabled()) + { + actionMenu->plug(d->m_RMBMenu); + } + delete rmbMenuEntries[actionType]; + rmbMenuEntries[actionType] = nullptr; } + + // Global Configuration + menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration")); + + d->m_deviceManagerAction->plug(menu); + d->m_shortcutKeysAction->plug(menu); + + // Help & Quit + menu->insertSeparator(); + menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), d->m_helpMenu->menu()); + d->m_quitAction->plug(menu); } -void HwDeviceSystemTray::slotOpenDevice(int parameter) +void HwDeviceSystemTray::populateLMBMenu() { - TQString uuid = m_openMenuIndexMap[parameter]; - if (!uuid.isEmpty()) + d->m_LMBMenu->clear(); + d->m_LMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"), 0); + + d->m_actionMenuEntryMap.clear(); + int actionMenuIdx = 0; + + // Find all storage devices and add them to the popup menus + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); + TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); + TQMap<TQString, TDEActionMenu*> lmbMenuEntries; + for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) + TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); + if (isMonitoredDevice(sdevice) && + (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) || + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable) || + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))) { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + TQString deviceLabel = getDeviceLabel(sdevice); + TDEActionMenu *actionMenu = new TDEActionMenu(deviceLabel, + sdevice->icon(TDEIcon::SizeSmall)); + + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) { - if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) + // Mounted and unmounted disks can also be opened + addDeviceToLMBMenu(sdevice, SDActions::Open, actionMenu, actionMenuIdx); + + if (sdevice->mountPath().isEmpty()) { - new KRun(TQString("media:/%1").arg(sdevice->friendlyName())); + addDeviceToLMBMenu(sdevice, SDActions::Mount, actionMenu, actionMenuIdx); } else { - new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true))); + addDeviceToLMBMenu(sdevice, SDActions::Unmount, actionMenu, actionMenuIdx); } - return; } - } - } -} -void HwDeviceSystemTray::slotMountDevice(int parameter) -{ - TQString uuid = m_mountMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) { - if (sdevice->mountPath().isEmpty()) + if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-m" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Lock, actionMenu, actionMenuIdx); } - } - } - } -} - -void HwDeviceSystemTray::slotUnmountDevice(int parameter) -{ - TQString uuid = m_unmountMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - if (!sdevice->mountPath().isEmpty()) + else { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-u" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Unlock, actionMenu, actionMenuIdx); } } - } - } -} -void HwDeviceSystemTray::slotUnlockDevice(int parameter) -{ - TQString uuid = m_unlockMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-k" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Eject, actionMenu, actionMenuIdx); + + addDeviceToLMBMenu(sdevice, SDActions::SafeRemove, actionMenu, actionMenuIdx); } + + addDeviceToLMBMenu(sdevice, SDActions::Properties, actionMenu, actionMenuIdx); + + lmbMenuEntries[deviceLabel] = actionMenu; } } -} - -void HwDeviceSystemTray::slotLockDevice(int parameter) -{ - TDEGenericDevice *hwdevice; - TQString uuid = m_lockMenuIndexMap[parameter]; - if (!uuid.isEmpty()) + // Insert menu entries in sorted order + for (TDEActionMenu *am : lmbMenuEntries) { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-l" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } - } - } + am->plug(d->m_LMBMenu); } } -void HwDeviceSystemTray::slotEjectDevice(int parameter) +void HwDeviceSystemTray::slotExecuteDeviceAction(int parameter) { - TQString uuid = m_ejectMenuIndexMap[parameter]; + TQString uuid = d->m_actionMenuEntryMap[parameter].uuid; + int actionType = d->m_actionMenuEntryMap[parameter].actionType; if (!uuid.isEmpty()) { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -551,56 +553,42 @@ void HwDeviceSystemTray::slotEjectDevice(int parameter) TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-e" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) + if (actionType == SDActions::Open) { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); + if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) + { + new KRun(TQString("media:/%1").arg(sdevice->friendlyName())); + } + else + { + new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true))); + } } - } - } - } -} - -void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter) -{ - TQString uuid = m_safeRemoveMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-s" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) + else if (actionType == SDActions::Properties) { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); + new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode()))); + } + else + { + TQString opType = TQString::null; + if (actionType == SDActions::Mount) { opType = "-m"; } + else if (actionType == SDActions::Unmount) { opType = "-u"; } + else if (actionType == SDActions::Unlock) { opType = "-k"; } + else if (actionType == SDActions::Lock) { opType = "-l"; } + else if (actionType == SDActions::Eject) { opType = "-e"; } + else if (actionType == SDActions::SafeRemove) { opType = "-s"; } + + if (!opType.isEmpty()) + { + TDEProcess proc; + proc << "tdeio_media_mounthelper" << opType << sdevice->deviceNode(); + if (!proc.start(TDEProcess::DontCare)) + { + KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), + i18n("Device monitor")); + } + } } - } - } - } -} - -void HwDeviceSystemTray::slotPropertiesDevice(int parameter) -{ - TQString uuid = m_propertiesMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode()))); - return; } } } @@ -642,8 +630,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) // Scan devices for changes and notify new devices if needed. // This is necessary because the device information may not be available // at the time the hardwareAdded signal is emitted - TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = m_knownDiskDevices; - m_knownDiskDevices.clear(); + TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = d->m_knownDiskDevices; + d->m_knownDiskDevices.clear(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) @@ -654,22 +642,17 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) TQString sysPath = sdevice->systemPath(); if (oldKnownDevices.contains(sysPath)) { - m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath]; + d->m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath]; oldKnownDevices.remove(sysPath); } else { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() }; if (!scanOnly && popupEnable) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been added!"), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been added!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); } } @@ -681,9 +664,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt; for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been removed!"), - i18n("%1 (%2)").arg(delIt.data().friendlyName, delIt.data().node), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been removed!"), delIt.data().deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key()); } } @@ -697,21 +679,16 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) // The device information may not be available at the time the hardwareAdded signal is emitted. // In such case ignore the event and handle that at the subsequent hardwareUpdate signal emission. TQString sysPath = sdevice->systemPath(); - if (isMonitoredDevice(sdevice) && !m_knownDiskDevices.contains(sysPath)) + if (isMonitoredDevice(sdevice) && !d->m_knownDiskDevices.contains(sysPath)) { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() }; TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been added!"), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been added!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); } } @@ -724,18 +701,18 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) { TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device); TQString sysPath = sdevice->systemPath(); - if (isMonitoredDevice(sdevice) && m_knownDiskDevices.contains(sysPath)) + if (isMonitoredDevice(sdevice) && d->m_knownDiskDevices.contains(sysPath)) { TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been removed!"), - i18n("%1 (%2)").arg(m_knownDiskDevices[sysPath].friendlyName, m_knownDiskDevices[sysPath].node), + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been removed!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath); } - m_knownDiskDevices.remove(sysPath); + d->m_knownDiskDevices.remove(sysPath); } } } @@ -748,6 +725,13 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, TQString uuid) { TDEGenericDevice *hwdevice; if (uuid.startsWith("ADD: ")) { + TDEConfig config("mediamanagerrc"); + config.setGroup("Global"); + if (config.readBoolEntry("NotificationPopupsEnabled", true)) + { + return; + } + uuid = uuid.right(uuid.length() - strlen("ADD: ")); if (uuid != "") { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -776,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, } void HwDeviceSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "hwdevicetray"); + tdeApp->invokeHelp(TQString::null, "hwdevicetray"); } #include "hwdevicetray.moc" diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h index c0465f2bf..4f019ae58 100644 --- a/kcontrol/hwmanager/hwdevicetray.h +++ b/kcontrol/hwmanager/hwdevicetray.h @@ -1,8 +1,8 @@ /* * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net> - * + * * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application - * + * * hwdevicetray is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 @@ -20,93 +20,58 @@ #ifndef TDEHWDEVICETRAY_H #define TDEHWDEVICETRAY_H -#include <tqptrlist.h> - #include <ksystemtray.h> -#include <kglobalaccel.h> -#include <ksimpleconfig.h> -#include <tdepassivepopupstack.h> -#include <tdehardwaredevices.h> -#include <tdestoragedevice.h> - -class KHelpMenu; -class PasswordDlg; +class HwDeviceSystemTrayPrivate; +class KPassivePopup; +class TDEActionMenu; +class TDEGenericDevice; +class TDEGlobalAccel; class TDEPopupMenu; +class TDEStorageDevice; -typedef TQMap<int, TQString> TQStringMap; - -class HwDeviceSystemTray : public KSystemTray +class HwDeviceSystemTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0); ~HwDeviceSystemTray(); - TDEGlobalAccel *globalKeys; - virtual void contextMenuAboutToShow(TDEPopupMenu* menu); + TDEGlobalAccel *globalKeys; - void configChanged(); + virtual void contextMenuAboutToShow(TDEPopupMenu *menu); protected slots: void slotHardwareConfig(); void slotEditShortcutKeys(); void slotSettingsChanged(int category); void slotHelpContents(); + void slotExecuteDeviceAction(int parameter); - void slotOpenDevice(int parameter); - void slotMountDevice(int parameter); - void slotUnmountDevice(int parameter); - void slotUnlockDevice(int parameter); - void slotLockDevice(int parameter); - void slotEjectDevice(int parameter); - void slotSafeRemoveDevice(int parameter); - void slotPropertiesDevice(int parameter); - -protected: - void mousePressEvent(TQMouseEvent *e); - void resizeEvent(TQResizeEvent *); - void showEvent(TQShowEvent *); - -private slots: - void _quit(); + void quitApp(); void deviceAdded(TDEGenericDevice*); void deviceRemoved(TDEGenericDevice*); void deviceChanged(TDEGenericDevice*); void devicePopupClicked(KPassivePopup*, TQPoint, TQString); void doDiskNotifications(bool scanOnly); -private: - static bool isMonitoredDevice(TDEStorageDevice *sdevice); - -private: - void populateMenu(TDEPopupMenu* menu); +protected: + void initMenus(); + void mousePressEvent(TQMouseEvent *e); + void populateLMBMenu(); + void resizeEvent(TQResizeEvent *); void resizeTrayIcon(); + void showEvent(TQShowEvent *); - bool m_popupUp; - KHelpMenu* m_help; - - TQWidget* m_parent; - TDEPassivePopupStackContainer* m_hardwareNotifierContainer; + static bool isMonitoredDevice(TDEStorageDevice *sdevice); + static TQString getDeviceLabel(TDEStorageDevice *sdevice); - TQStringMap m_openMenuIndexMap; - TQStringMap m_mountMenuIndexMap; - TQStringMap m_unmountMenuIndexMap; - TQStringMap m_unlockMenuIndexMap; - TQStringMap m_lockMenuIndexMap; - TQStringMap m_ejectMenuIndexMap; - TQStringMap m_safeRemoveMenuIndexMap; - TQStringMap m_propertiesMenuIndexMap; - TDEPopupMenu* m_menu; - KSimpleConfig *r_config; + void addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, TDEActionMenu *actionMenu, + int &actionMenuIdx); + void addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx); - struct KnownDiskDeviceInfo - { - TQString friendlyName; - TQString node; - }; - TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices; + HwDeviceSystemTrayPrivate *d; }; #endif diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h index fae4d6cd9..b4e03973f 100644 --- a/kcontrol/hwmanager/hwdevicetray_app.h +++ b/kcontrol/hwmanager/hwdevicetray_app.h @@ -21,13 +21,13 @@ #define TDEHWDEVICEAPP_H #include <tqtimer.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class HwDeviceSystemTray; -class HwDeviceApp : public KUniqueApplication +class HwDeviceApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: HwDeviceApp(); diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp index bcbbbda1b..09974ac68 100644 --- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp +++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.h b/kcontrol/hwmanager/hwdevicetray_configdialog.h index 657b3ee43..823931757 100644 --- a/kcontrol/hwmanager/hwdevicetray_configdialog.h +++ b/kcontrol/hwmanager/hwdevicetray_configdialog.h @@ -42,7 +42,7 @@ class ConfigDialog; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TDEGlobalAccel *accel, bool isApplet ); diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 265901003..662844ec3 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <kpassdlg.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <string> #include <stdio.h> #include <tqstring.h> @@ -59,8 +59,8 @@ using namespace std; typedef KGenericFactory<TDEHWManager, TQWidget> TDEHWManagerFactory; K_EXPORT_COMPONENT_FACTORY( kcm_hwmanager, TDEHWManagerFactory("kcmhwmanager") ) -KSimpleConfig *config; -KSimpleConfig *systemconfig; +TDESimpleConfig *config; +TDESimpleConfig *systemconfig; /**** TDEHWManager ****/ @@ -68,8 +68,8 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis : TDECModule(TDEHWManagerFactory::instance(), parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); + systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0, @@ -87,18 +87,19 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis base->deviceFilter->setListView(base->deviceTree); + deviceUpdateScheduled = false; + setRootOnlyMsg(i18n("<b>Device settings are system wide, and therefore require administrator access</b><br>To alter the system's device settings, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); hwdevices->setTriggerlessHardwareUpdatesEnabled(true); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); load(); @@ -132,8 +133,19 @@ void TDEHWManager::defaults() load( true ); } +void TDEHWManager::scheduleDeviceUpdate() +{ + if (!deviceUpdateScheduled) + { + deviceUpdateScheduled = true; + TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView())); + } +} + void TDEHWManager::populateTreeView() { + deviceUpdateScheduled = false; + bool show_by_connection = base->showByConnection->isChecked(); // Figure out which device, if any, was selected @@ -154,7 +166,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -176,7 +188,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -199,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -215,24 +227,6 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con } } -void TDEHWManager::deviceChanged(TDEGenericDevice* device) { - TQListViewItemIterator it(base->deviceTree); - while (it.current()) { - DeviceIconItem* item = dynamic_cast<DeviceIconItem*>(it.current()); - if (item) { - TDEGenericDevice* candidate = item->device(); - if (candidate) { - if (candidate->systemPath() == device->systemPath()) { - if (item->text(0) != device->detailedFriendlyName()) { - item->setText(0, device->detailedFriendlyName()); - } - } - } - } - ++it; - } -} - void TDEHWManager::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) { TQString password; int result = KPasswordDialog::getPassword(password, prompt); diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index abc05fa54..020a51f22 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -41,7 +41,7 @@ class TDEListViewItem; class TDEHWManager : public TDECModule, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: //TDEHWManager(TQWidget *parent = 0L, const char *name = 0L); @@ -58,15 +58,15 @@ public: k_dcop: private slots: + void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); void populateTreeView(); void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath); - void deviceChanged(TDEGenericDevice*); - void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); + void scheduleDeviceUpdate(); private: TDEHWManagerBase *base; - TDEConfig *config; + bool deviceUpdateScheduled; }; #endif diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 6c785921d..ee84b81c3 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -74,9 +74,9 @@ <include location="local" impldecl="in implementation">TDEHWManagerBase.ui.h</include> <include location="local" impldecl="in implementation">deviceiconview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp index 07b6027ae..22b82648f 100644 --- a/kcontrol/hwmanager/passworddlg.cpp +++ b/kcontrol/hwmanager/passworddlg.cpp @@ -30,7 +30,7 @@ PasswordDlg::PasswordDlg() : enableButton( User1, false ); unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked", TDEIcon::NoGroup, TDEIcon::SizeLarge)); - connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); + connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &))); setMainWidget(unlockDialog); } diff --git a/kcontrol/hwmanager/passworddlg.h b/kcontrol/hwmanager/passworddlg.h index bee1431cc..091b5aa5f 100644 --- a/kcontrol/hwmanager/passworddlg.h +++ b/kcontrol/hwmanager/passworddlg.h @@ -39,7 +39,7 @@ class PasswordDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PasswordDlg(); diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 2ca108e3f..82fc0edfd 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -42,7 +42,7 @@ #include <kgenericfactory.h> #include <unistd.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <string> #include <stdio.h> #include <tqstring.h> @@ -55,8 +55,8 @@ using namespace std; typedef KGenericFactory<KICCConfig, TQWidget> KICCCFactory; K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") ) -KSimpleConfig *config; -KSimpleConfig *systemconfig; +TDESimpleConfig *config; +TDESimpleConfig *systemconfig; /**** KICCConfig ****/ @@ -66,12 +66,12 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); if (getuid() != 0) { - config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); } else { config = NULL; } - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); + systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE Color Profile Control Module"), @@ -87,23 +87,23 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) setRootOnlyMsg(i18n("<b>The global color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global profile, click on the \"Administrator Mode\" button below.")); // setUseRootOnlyMsg(true); // Setting this hides the Apply button! - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int))); - connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int))); - connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray())); - connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - - connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile())); - connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile())); - connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->systemIccFile, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccFile, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->randrScreenList, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccProfileList, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->addProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->renameProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->deleteProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->iccProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int))); + connect(base->randrScreenList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectScreen(int))); + connect(base->iccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateArray())); + connect(base->systemIccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + + connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile())); + connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile())); + connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile())); load(); diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index 4fd29e4e9..d3681c5bb 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -38,7 +38,7 @@ class TDEListViewItem; class KICCConfig : public TDECModule, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui index 499d626f0..bca12d092 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -185,9 +185,9 @@ <includes> <include location="local" impldecl="in implementation">ICCConfigBase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 667ecaa22..c2fed475f 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -52,7 +52,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) KDialog::spacingHint()); g_vlay->addSpacing(fontMetrics().lineSpacing()); mpUsageList = new TQListBox(gbox); - connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int))); + connect(mpUsageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsage(int))); g_vlay->addWidget(mpUsageList); KSeparator *sep = new KSeparator( KSeparator::HLine, this ); @@ -65,11 +65,11 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) TQPushButton *push; mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay); - connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0())); + connect(mPreviewButton1, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup0())); mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay); - connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1())); + connect(mPreviewButton2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup1())); mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay); - connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2())); + connect(mPreviewButton3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup2())); m_pTab1 = new TQWidget(this, "General Tab"); top->addWidget(m_pTab1, 0, 1); @@ -81,32 +81,32 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) // Size TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); lbl->setFixedSize(lbl->sizeHint()); - grid->addWidget(lbl, 0, 0, Qt::AlignLeft); + grid->addWidget(lbl, 0, 0, TQt::AlignLeft); mpSizeBox = new TQComboBox(m_pTab1); - connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); + connect(mpSizeBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSize(int))); lbl->setBuddy(mpSizeBox); - grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft); + grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft); mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1); - connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool))); - grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft); + connect(mpDPCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDPCheck(bool))); + grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft); mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1); - connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool))); - grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft); + connect(mpAnimatedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnimatedCheck(bool))); + grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft); mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1); - connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool))); - grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft); + connect(mpRoundedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRoundedCheck(bool))); + grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft); mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1); - connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool))); - grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft); + connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool))); + grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft); top->activate(); - mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + mpSystrayConfig = new TDESimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" )); init(); read(); @@ -123,13 +123,13 @@ TDEIconConfig::~TDEIconConfig() TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay) { TQLabel *lab = new TQLabel(str, parent); - lay->addWidget(lab, 1, i, Qt::AlignCenter); + lay->addWidget(lab, 1, i, TQt::AlignCenter); mpPreview[i] = new TQLabel(parent); mpPreview[i]->setAlignment(AlignCenter); mpPreview[i]->setMinimumSize(105, 105); lay->addWidget(mpPreview[i], 2, i); TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); - lay->addWidget(push, 3, i, Qt::AlignCenter); + lay->addWidget(push, 3, i, TQt::AlignCenter); return push; } @@ -477,8 +477,8 @@ void TDEIconConfig::save() g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") ); mpConfig->sync(); mpSystrayConfig->sync(); @@ -497,10 +497,10 @@ void TDEIconConfig::save() } // Signal kicker to reload icon configuration - kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray()); // Signal system tray to reload icon configuration - kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray()); } void TDEIconConfig::defaults() @@ -689,7 +689,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect, lbl = new TQLabel(i18n("&Effect:"), page); lbl->setFixedSize(lbl->sizeHint()); - top->addWidget(lbl, 0, 0, Qt::AlignLeft); + top->addWidget(lbl, 0, 0, TQt::AlignLeft); mpEffectBox = new TQListBox(page); mpEffectBox->insertItem(i18n("No Effect")); mpEffectBox->insertItem(i18n("To Gray")); @@ -698,13 +698,13 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect, mpEffectBox->insertItem(i18n("Desaturate")); mpEffectBox->insertItem(i18n("To Monochrome")); mpEffectBox->setMinimumWidth( 100 ); - connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int))); - top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft); + connect(mpEffectBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotEffectType(int))); + top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft); lbl->setBuddy(mpEffectBox); mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page); - connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool))); - top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft); + connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool))); + top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft); frame = new TQGroupBox(i18n("Preview"), page); top->addMultiCellWidget(frame, 0, 1, 1, 1); @@ -724,25 +724,25 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect, mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup); grid->addWidget(mpEffectLabel, 1, 0); - mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup); + mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup); mpEffectLabel->setBuddy( mpEffectSlider ); - connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int))); + connect(mpEffectSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotEffectValue(int))); grid->addWidget(mpEffectSlider, 1, 1); mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup); grid->addWidget(mpEffectColor, 2, 0); mpEColButton = new KColorButton(mpEffectGroup); mpEffectColor->setBuddy( mpEColButton ); - connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotEffectColor(const TQColor &))); + connect(mpEColButton, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotEffectColor(const TQColor &))); grid->addWidget(mpEColButton, 2, 1); mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup); grid->addWidget(mpEffectColor2, 3, 0); mpECol2Button = new KColorButton(mpEffectGroup); mpEffectColor2->setBuddy( mpECol2Button ); - connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotEffectColor2(const TQColor &))); + connect(mpECol2Button, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotEffectColor2(const TQColor &))); grid->addWidget(mpECol2Button, 3, 1); init(); diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index 2c00a16e5..2d17ecf0c 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -18,7 +18,7 @@ #include <tdecmodule.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> class TQCheckBox; class TQColor; @@ -55,7 +55,7 @@ struct Effect */ class TDEIconConfig: public TDECModule { - Q_OBJECT + TQ_OBJECT public: TDEIconConfig(TQWidget *parent, const char *name=0); @@ -107,8 +107,8 @@ private: TDEIconTheme *mpTheme; TDEIconLoader *mpLoader; TDEConfig *mpConfig; - KSimpleConfig *mpSystrayConfig; - KSimpleConfig *mpKickerConfig; + TDESimpleConfig *mpSystrayConfig; + TDESimpleConfig *mpKickerConfig; typedef TQLabel *QLabelPtr; QLabelPtr mpPreview[3]; @@ -123,7 +123,7 @@ private: class TDEIconEffectSetupDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TDEIconEffectSetupDialog(const Effect &, const Effect &, diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 826f6300d..b6a37f11f 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -28,10 +28,10 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservice.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #undef Unsorted #include <kipc.h> @@ -82,15 +82,15 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) m_iconThemes->addColumn(i18n("Description")); m_iconThemes->setAllColumnsShowFocus( true ); m_iconThemes->setFullWidth(true); - connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(themeSelected(TQListViewItem *))); + connect(m_iconThemes,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(themeSelected(TQListViewItem *))); TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."), this, "InstallNewTheme"); - connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme())); + connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(installNewTheme())); m_removeButton=new TQPushButton( i18n("Remove Theme"), this, "RemoveTheme"); - connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme())); + connect(m_removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeSelectedTheme())); topLayout->addWidget( new TQLabel(i18n("Select the icon theme you want to use:"), this)); @@ -214,7 +214,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString KTar archive(archiveName); archive.open(IO_ReadOnly); - kapp->processEvents(); + tdeApp->processEvents(); const KArchiveDirectory* rootDir = archive.directory(); @@ -225,7 +225,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString progressDiag.setLabel( i18n("<qt>Installing <strong>%1</strong> theme</qt>") .arg(*it)); - kapp->processEvents(); + tdeApp->processEvents(); if (progressDiag.wasCancelled()) break; @@ -419,7 +419,7 @@ void IconThemesConfig::save() if (!selected) return; - KSimpleConfig *config = new KSimpleConfig("kdeglobals", false); + TDESimpleConfig *config = new TDESimpleConfig("kdeglobals", false); config->setGroup("Icons"); config->writeEntry("Theme", m_themeNames[selected->text(0)]); delete config; diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index ccb914846..424d58630 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -32,7 +32,7 @@ class TQStringList; class IconThemesConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L); diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index 359bfec91..214e85a70 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -45,11 +45,11 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) tab1 = new IconThemesConfig(this, "themes"); tab->addTab(tab1, i18n("&Theme")); - connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(tab1, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); tab2 = new TDEIconConfig(this, "effects"); tab->addTab(tab2, i18n("Ad&vanced")); - connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(tab2, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0", I18N_NOOP("Icons Control Panel Module"), diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h index 840704351..eea944b6b 100644 --- a/kcontrol/icons/main.h +++ b/kcontrol/icons/main.h @@ -31,7 +31,7 @@ class IconModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: IconModule(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt index dbedbfe4d..35064b574 100644 --- a/kcontrol/info/CMakeLists.txt +++ b/kcontrol/info/CMakeLists.txt @@ -39,10 +39,14 @@ tde_create_translated_desktop( ) +##### configure checks ########################## + +include( ConfigureChecks.cmake ) + ##### kcm_info (module) ######################### tde_add_kpart( kcm_info AUTOMOC SOURCES main.cpp memory.cpp ${OPENGL_SOURCES} - LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES} + LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES} ${KSTAT_LIBRARIES} ${DEVINFO_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/info/ConfigureChecks.cmake b/kcontrol/info/ConfigureChecks.cmake new file mode 100644 index 000000000..ec881f0f2 --- /dev/null +++ b/kcontrol/info/ConfigureChecks.cmake @@ -0,0 +1,21 @@ +################################################# +# +# (C) 2023 DilOS Team +# denis (AT) tambov (DOT) ru +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# devinfo +check_library_exists( devinfo di_init "" HAVE_DEVINFO ) +if( HAVE_DEVINFO ) + set( DEVINFO_LIBRARIES devinfo ) +else() + if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) + tde_message_fatal( "libdevinfo not found on SunOS platform!" ) + endif() + set( DEVINFO_LIBRARIES "" ) +endif( ) diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am index 30eb5ebe8..6db9c62b9 100644 --- a/kcontrol/info/Makefile.am +++ b/kcontrol/info/Makefile.am @@ -7,7 +7,7 @@ endif kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO) -kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) METASOURCES = AUTO AM_CPPFLAGS= $(all_includes) $(GLINC) diff --git a/kcontrol/info/configure.in.in b/kcontrol/info/configure.in.in index 9bc6d1c4b..cee8a2deb 100644 --- a/kcontrol/info/configure.in.in +++ b/kcontrol/info/configure.in.in @@ -1,11 +1,7 @@ -# libmach for Tru64 # linux/raw.h for Linux # devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD case "$host" in - *-*-osf*) - AC_CHECK_LIB(mach, vm_statistics, LIB_TRU64_MACH="-lmach")dnl - ;; *-*-linux*) AC_CHECK_HEADERS(linux/raw.h sys/raw.h)dnl ;; @@ -14,7 +10,6 @@ case "$host" in AC_CHECK_LIB(devinfo, devinfo_foreach_rman, LIBDEVINFO="-ldevinfo") ;; esac -AC_SUBST(LIB_TRU64_MACH) AC_HAVE_GL( have_gl=yes, have_gl=no ) AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes) diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index 9aa0d3767..f4625813f 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -265,7 +265,7 @@ struct model _4C_models[] = }; -/* all GetInfo_ functions should return TRUE, when the Information +/* all GetInfo_ functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp index 3ccd1c086..ec7b90bf8 100644 --- a/kcontrol/info/info_fbsd.cpp +++ b/kcontrol/info/info_fbsd.cpp @@ -21,8 +21,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_generic.cpp b/kcontrol/info/info_generic.cpp index 367e1657b..c914159ab 100644 --- a/kcontrol/info/info_generic.cpp +++ b/kcontrol/info/info_generic.cpp @@ -25,7 +25,7 @@ #define INFO_CD_ROM_AVAILABLE -/* all following functions should return TRUE, when the Information +/* all following functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index bbda9691d..6354aa46d 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -293,7 +293,7 @@ static void cleanPassword(TQString & str) while (index >= 0) { - index = str.find(passwd, index, FALSE); + index = str.find(passwd, index, false); if (index >= 0) { index += passwd.length(); while (index < (int) str.length() && diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 2fced7e40..73b252501 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -24,8 +24,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ @@ -179,7 +179,7 @@ bool GetInfo_IRQ (TQListView *lBox) lBox->addColumn(i18n("IRQ")); lBox->addColumn(i18n("Device")); lBox->setSorting(0); - lBox->setShowSortIndicator(FALSE); + lBox->setShowSortIndicator(false); (void) GetDmesgInfo(lBox, "[ (]irq ", AddIRQLine); return true; } diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 7b484da76..84000b79a 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -24,8 +24,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 5f18aebea..96bfa75bb 100644 --- a/kcontrol/info/info_osx.cpp +++ b/kcontrol/info/info_osx.cpp @@ -31,8 +31,8 @@ #define INFO_XSERVER_AVAILABLE /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_sgi.cpp b/kcontrol/info/info_sgi.cpp index 7961d4e16..f2740c0d4 100644 --- a/kcontrol/info/info_sgi.cpp +++ b/kcontrol/info/info_sgi.cpp @@ -15,7 +15,7 @@ #define INFO_XSERVER_AVAILABLE -/* all following functions should return TRUE, when the Information +/* all following functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 9f2b17e1b..f6ab922ea 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -45,9 +45,9 @@ bool GetInfo_CPU( TQListView *lBox ) { char *ptr; uint32_t i, ncpus; unsigned long state_begin; - QString state; - QString mhz; - QString inst; + TQString state; + TQString mhz; + TQString inst; /* * get a kstat handle first and update the user's kstat chain @@ -167,8 +167,8 @@ bool GetInfo_Partitions( TQListView *lBox ) { struct mnttab mnt; struct statvfs statbuf; fsblkcnt_t tmp; - QString total; - QString avail; + TQString total; + TQString avail; time_t mnttime; char *timetxt; char *ptr; @@ -315,7 +315,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox ) { */ TQListViewItem *mktree( TQListViewItem *top, const char *path ) { - QListViewItem *parent, + TQListViewItem *parent, *previous, *result; char *str = strdup( path ), @@ -380,7 +380,7 @@ TQListViewItem *mktree( TQListViewItem *top, const char *path ) { /* * prop_type_str() -- return the property type as a string */ -char *prop_type_str( di_prop_t prop ) { +const char *prop_type_str( di_prop_t prop ) { switch( di_prop_type( prop )) { case DI_PROP_TYPE_UNDEF_IT: @@ -448,8 +448,8 @@ int prop_type_guess( uchar_t *data, int len ) { */ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) { - QListViewItem *item; - QString majmin; + TQListViewItem *item; + TQString majmin; char *type; dev_t dev; @@ -466,7 +466,7 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) { (type == NULL) ? "NULL" : type ); if( (dev = di_minor_devt( minor )) != DDI_DEV_T_NONE ) { - majmin.sprintf( "%ld/%ld", major( dev ), minor( dev )); + majmin.sprintf( "%u/%u", major( dev ), minor( dev )); new TQListViewItem( item, i18n( "Major/Minor:" ), majmin ); } @@ -486,7 +486,7 @@ TQString propvalue( di_prop_t prop ) { char *strp; int *intp; uchar_t *bytep; - QString result; + TQString result; /* * Since a lot of printable strings seem to be tagged as 'byte', @@ -562,14 +562,14 @@ TQString propvalue( di_prop_t prop ) { */ int dump_node( di_node_t node, void *arg ) { - QListViewItem *top = (TQListViewItem *) arg, + TQListViewItem *top = (TQListViewItem *) arg, *parent, *previous; - char *path; - char *drivername; - char *names; - QString compatnames; - int i, n; + char *path; + char *drivername; + char *names; + TQString compatnames; + int i, n; di_prop_t prop; path = di_devfs_path( node ); @@ -641,7 +641,7 @@ int dump_node( di_node_t node, void *arg ) { /* * property type & value */ - QListViewItem *tmp, + TQListViewItem *tmp, *prev; tmp = new TQListViewItem( previous, di_prop_name( prop )); tmp->setExpandable( true ); @@ -668,7 +668,7 @@ int dump_node( di_node_t node, void *arg ) { bool GetInfo_Devices( TQListView *lBox ) { - QListViewItem *top; + TQListViewItem *top; di_node_t root_node; /* diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp index 780b6532e..85ef53687 100644 --- a/kcontrol/info/main.cpp +++ b/kcontrol/info/main.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CPU_AVAILABLE return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU); @@ -43,7 +43,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IRQ_AVAILABLE return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ); @@ -52,7 +52,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PCI_AVAILABLE return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI); @@ -61,7 +61,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DMA_AVAILABLE return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA); @@ -70,7 +70,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IOPORTS_AVAILABLE return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports); @@ -79,7 +79,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SOUND_AVAILABLE return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound); @@ -88,7 +88,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SCSI_AVAILABLE return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI); @@ -97,7 +97,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DEVICES_AVAILABLE return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices); @@ -106,7 +106,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PARTITIONS_AVAILABLE return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions); @@ -115,7 +115,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) { #ifdef INFO_XSERVER_AVAILABLE return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video); @@ -124,12 +124,12 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) { return new KMemoryWidget(parent, "kcminfo"); } - KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) { #ifdef INFO_OPENGL_AVAILABLE return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL); @@ -139,7 +139,7 @@ extern "C" } /* create_cdinfo function for CD-ROM Info ~Jahshan */ - KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CD_ROM_AVAILABLE return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 76d68d675..71e7a1dc8 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -252,8 +252,8 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) timer = new TQTimer(this); timer->start(100); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(update_Values())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(update_Values())); update(); } @@ -459,8 +459,6 @@ void KMemoryWidget::update_Values() #include "memory_hpux.cpp" #elif defined(__NetBSD__) || defined(__OpenBSD__) #include "memory_netbsd.cpp" -#elif __osf__ -#include "memory_tru64.cpp" #else /* Default for unsupported systems */ diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index 6fd2cd093..7e6285dee 100644 --- a/kcontrol/info/memory.h +++ b/kcontrol/info/memory.h @@ -28,7 +28,7 @@ typedef unsigned long t_memsize; #define COLOR_FREE_MEMORY TQColor(127,255,212) class KMemoryWidget:public TDECModule { - Q_OBJECT + TQ_OBJECT public: KMemoryWidget(TQWidget * parent, const char *name = 0); diff --git a/kcontrol/info/memory_fbsd.cpp b/kcontrol/info/memory_fbsd.cpp index 80a28749e..f307563f3 100644 --- a/kcontrol/info/memory_fbsd.cpp +++ b/kcontrol/info/memory_fbsd.cpp @@ -11,9 +11,9 @@ void KMemoryWidget::update() { - char blah[10], buf[80], *used_str, *total_str; + char buf[80], *used_str, *total_str; /* Stuff for sysctl */ - int memory; + unsigned long memory; size_t len; /* Stuff for swap display */ int used, total, _free; @@ -22,7 +22,6 @@ void KMemoryWidget::update() len=sizeof(memory); sysctlbyname("hw.physmem", &memory, &len, NULL, 0); - snprintf(blah, 10, "%d", memory); // Numerical values // total physical memory (without swap space) diff --git a/kcontrol/info/memory_tru64.cpp b/kcontrol/info/memory_tru64.cpp deleted file mode 100644 index c3cbb2fae..000000000 --- a/kcontrol/info/memory_tru64.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This is memory_tru64.cpp to retrieve memory information under Tru64/Alpha. - * - * Implemented by Tom Leitner, Tom@radar.tu-graz.ac.at - * - * WARNING: This module requires linking with -lmach - * - * This routine is based on m_decosf1.c from the "top" program written by: - * - * AUTHOR: Anthony Baxter, <anthony@aaii.oz.au> - * - */ - -#include <stdio.h> -#include <unistd.h> -#include <sys/socket.h> -#include <sys/mbuf.h> -#include <net/route.h> -#include <sys/table.h> -extern "C" { -#include <mach/mach_traps.h> -} -#include <mach/vm_statistics.h> - -#define pagetob(size) (MEMORY(1024L) * ((long) (size) << (long) pageshift)) -#define LOG1024 10 - -extern "C" void vm_statistics(task_t, vm_statistics_data_t*); - -void KMemoryWidget::update() -{ - int pageshift; /* log base 2 of the pagesize */ - int pagesize; - vm_statistics_data_t vmstats; - int swap_pages=0,swap_free=0,i; - struct tbl_swapinfo swbuf; - - /* get the page size with "getpagesize" and calculate pageshift from it */ - - pagesize = getpagesize(); - pageshift = 0; - while (pagesize > 1) { - pageshift++; - pagesize >>= 1; - } - - /* we only need the amount of log(2)1024 for our conversion */ - - pageshift -= LOG1024; - - /* memory information */ - /* this is possibly bogus - we work out total # pages by */ - /* adding up the free, active, inactive, wired down, and */ - /* zero filled. Anyone who knows a better way, TELL ME! */ - /* Change: dont use zero filled. */ - - (void) ::vm_statistics(::task_self(), &vmstats); - - /* thanks DEC for the table() command. No thanks at all for */ - /* omitting the man page for it from OSF/1 1.2, and failing */ - /* to document SWAPINFO in the 1.3 man page. Lets hear it for */ - /* include files. */ - - i=0; - while(table(TBL_SWAPINFO,i,&swbuf,1,sizeof(struct tbl_swapinfo))>0) { - swap_pages += swbuf.size; - swap_free += swbuf.free; - i++; - } - Memory_Info[TOTAL_MEM] = pagetob((vmstats.free_count + - vmstats.active_count + - vmstats.inactive_count + - vmstats.wire_count)); - Memory_Info[FREE_MEM] = pagetob(vmstats.free_count); - Memory_Info[SHARED_MEM] = NO_MEMORY_INFO; /* FIXME ?? */ - Memory_Info[BUFFER_MEM] = NO_MEMORY_INFO; /* FIXME ?? */ -#ifdef __GNUC__ -#warning "FIXME: Memory_Info[CACHED_MEM]" -#endif - Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; /* cached memory in ram */ - Memory_Info[SWAP_MEM] = pagetob(swap_pages); - Memory_Info[FREESWAP_MEM] = pagetob(swap_free); -} diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index 2fc6f6ce8..9cf3248d5 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -17,8 +17,6 @@ else( ) include_directories( core ) endif( ) -add_subdirectory( pics ) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} @@ -34,7 +32,7 @@ link_directories( ##### other data ################################ tde_create_translated_desktop( - SOURCE mouse.desktop + SOURCE mouse.desktop touchpad.desktop PO_DIR kcontrol-desktops ) @@ -47,18 +45,41 @@ install( FILES mouse_cursor_theme.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( + DIRECTORY pics/ + DESTINATION ${DATA_INSTALL_DIR}/kcminput/pics + FILES_MATCHING PATTERN *.png +) + +add_subdirectory(icons) + ##### kcm_input (module) ######################## tde_add_kpart( kcm_input AUTOMOC SOURCES - mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp - logitechmouse_base.ui - LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES} + mouse.cpp kmousedlg.ui main.cpp + logitechmouse.cpp logitechmouse_base.ui + touchpad.cpp touchpad_settings.cpp + LINK + themepage-static tdeio-shared + ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES} + ${XINPUT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) +##### tdesyndaemon (executable) #################### + +tde_add_executable( tdesyndaemon AUTOMOC + SOURCES + tdesyndaemon.cpp tdesyndaemon_iface.skel + touchpad_settings.cpp + LINK tdecore-shared ${XINPUT_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} +) + + ##### kapplymousetheme (executable) ############# tde_add_executable( kapplymousetheme diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 48b6711d9..38d6432bb 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -20,9 +20,9 @@ */ #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <tdemessagebox.h> @@ -66,8 +66,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectionChanged(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectionChanged(TQListViewItem*)) ); insertThemes(); } diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h index 47eb1a0f8..5442e158c 100644 --- a/kcontrol/input/core/themepage.h +++ b/kcontrol/input/core/themepage.h @@ -26,7 +26,7 @@ class TQListViewItem; class ThemePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/input/icons/CMakeLists.txt b/kcontrol/input/icons/CMakeLists.txt new file mode 100644 index 000000000..546096f2e --- /dev/null +++ b/kcontrol/input/icons/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons()
\ No newline at end of file diff --git a/kcontrol/input/icons/cr128-device-input-touchpad.png b/kcontrol/input/icons/cr128-device-input-touchpad.png Binary files differnew file mode 100644 index 000000000..5b5b16553 --- /dev/null +++ b/kcontrol/input/icons/cr128-device-input-touchpad.png diff --git a/kcontrol/input/icons/cr16-device-input-touchpad.png b/kcontrol/input/icons/cr16-device-input-touchpad.png Binary files differnew file mode 100644 index 000000000..bde3c5e48 --- /dev/null +++ b/kcontrol/input/icons/cr16-device-input-touchpad.png diff --git a/kcontrol/input/icons/cr32-device-input-touchpad.png b/kcontrol/input/icons/cr32-device-input-touchpad.png Binary files differnew file mode 100644 index 000000000..6e00abaa4 --- /dev/null +++ b/kcontrol/input/icons/cr32-device-input-touchpad.png diff --git a/kcontrol/input/icons/cr48-device-input-touchpad.png b/kcontrol/input/icons/cr48-device-input-touchpad.png Binary files differnew file mode 100644 index 000000000..7c6a41c56 --- /dev/null +++ b/kcontrol/input/icons/cr48-device-input-touchpad.png diff --git a/kcontrol/input/icons/cr64-device-input-touchpad.png b/kcontrol/input/icons/cr64-device-input-touchpad.png Binary files differnew file mode 100644 index 000000000..b124147fa --- /dev/null +++ b/kcontrol/input/icons/cr64-device-input-touchpad.png diff --git a/kcontrol/input/icons/crsc-device-input-touchpad.svg b/kcontrol/input/icons/crsc-device-input-touchpad.svg new file mode 100644 index 000000000..2802b4716 --- /dev/null +++ b/kcontrol/input/icons/crsc-device-input-touchpad.svg @@ -0,0 +1,485 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 10.0.3, SVG Export Plug-In . SVG Version: 3.0.0 Build 77) --> +<svg + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="128.338" + height="128" + viewBox="0 0 128.338 128" + overflow="visible" + enable-background="new 0 0 128.338 128" + xml:space="preserve" + id="svg1704" + sodipodi:version="0.32" + inkscape:version="0.42" + sodipodi:docname="touchpad.svg" + sodipodi:docbase="/home/kombrisn/Project/kdereview/ksynaptics"><metadata + id="metadata2067"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs + id="defs2065"> + + + + + <linearGradient + id="XMLID_1_" + gradientUnits="userSpaceOnUse" + x1="6.1904001" + y1="15.246600" + x2="118.40850" + y2="84.415398" + gradientTransform="matrix(1.000000,0.000000,0.000000,1.043928,0.287175,3.271150)"> + <stop + offset="0" + style="stop-color:#FFFFFF" + id="stop1712" /> + <stop + offset="1" + style="stop-color:#DCDCE0" + id="stop1714" /> + + + + </linearGradient> + + <linearGradient + id="XMLID_2_" + gradientUnits="userSpaceOnUse" + x1="116.84180" + y1="84.442398" + x2="16.851700" + y2="20.812099" + gradientTransform="matrix(1.000000,0.000000,0.000000,1.130136,0.287175,3.541282)"> + <stop + offset="0" + style="stop-color:#FFFFFF" + id="stop1719" /> + <stop + offset="1" + style="stop-color:#DCDCE0" + id="stop1721" /> + + + + </linearGradient> + + + + <linearGradient + id="XMLID_3_" + gradientUnits="userSpaceOnUse" + x1="94.294899" + y1="35.819801" + x2="96.824898" + y2="32.868401" + gradientTransform="matrix(0.985500,-0.169900,0.169900,0.985500,0.979900,-9.081100)"> + <stop + offset="0" + style="stop-color:#97FF86" + id="stop1728" /> + <stop + offset="1" + style="stop-color:#94FF7F" + id="stop1730" /> + + + + </linearGradient> + + + <linearGradient + id="XMLID_4_" + gradientUnits="userSpaceOnUse" + x1="94.387703" + y1="35.655800" + x2="96.723297" + y2="32.931099" + gradientTransform="matrix(0.985500,-0.169900,0.169900,0.985500,0.979900,-9.081100)"> + <stop + offset="0" + style="stop-color:#3DDF00" + id="stop1735" /> + <stop + offset="1" + style="stop-color:#94FF7F" + id="stop1737" /> + + + + </linearGradient> + + + + + <linearGradient + id="XMLID_5_" + gradientUnits="userSpaceOnUse" + x1="64.881302" + y1="55.002399" + x2="64.881302" + y2="-3.4971001" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.919938,0.000000,1.052981)"> + <stop + offset="0" + style="stop-color:#9E9EAC" + id="stop1748" /> + <stop + offset="1" + style="stop-color:#42425B" + id="stop1750" /> + + + + </linearGradient> + + + + + + + + + + + + + + <linearGradient + id="XMLID_18_" + gradientUnits="userSpaceOnUse" + x1="63.074699" + y1="54.390099" + x2="62.435501" + y2="69.409203" + gradientTransform="matrix(1.000000,0.000000,0.000000,1.043928,0.287175,3.271150)"> + <stop + offset="0" + style="stop-color:#FFFFFF" + id="stop1887" /> + <stop + offset="1" + style="stop-color:#FFFFFF;stop-opacity:0" + id="stop1889" /> + + + + </linearGradient> + + + <linearGradient + id="XMLID_20_" + gradientUnits="userSpaceOnUse" + x1="81.798798" + y1="104.17290" + x2="88.452904" + y2="114.22480"> + <stop + offset="0" + style="stop-color:#FFFFFF" + id="stop1905" /> + <stop + offset="1" + style="stop-color:#DCDCE0" + id="stop1907" /> + + + + </linearGradient> + + <linearGradient + id="XMLID_21_" + gradientUnits="userSpaceOnUse" + x1="72.246101" + y1="100.22750" + x2="72.246101" + y2="83.708900"> + <stop + offset="0" + style="stop-color:#9E9E9E" + id="stop1912" /> + <stop + offset="1" + style="stop-color:#616161" + id="stop1914" /> + + + + </linearGradient> + + <linearGradient + id="XMLID_22_" + gradientUnits="userSpaceOnUse" + x1="64.685097" + y1="-1.2637000" + x2="63.526699" + y2="114.37610" + gradientTransform="matrix(1.000000,0.000000,0.000000,1.130136,0.287175,3.541282)"> + <stop + offset="0" + style="stop-color:#9E9EAC" + id="stop1919" /> + <stop + offset="1" + style="stop-color:#42425B" + id="stop1921" /> + + + + </linearGradient> + + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient3115" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.259073,0.000000,0.000000,0.145048,44.66793,81.50629)" + x1="64.881302" + y1="55.002399" + x2="64.881302" + y2="-3.4971001" /><linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient3119" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.404572,0.000000,0.000000,0.210813,10.52265,95.00541)" + x1="64.881302" + y1="55.002399" + x2="64.881302" + y2="-3.4971001" /></defs><sodipodi:namedview + inkscape:window-height="725" + inkscape:window-width="1016" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="3.4822022" + inkscape:cx="72.564336" + inkscape:cy="56.149095" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:current-layer="Layer_1" /> + <g + id="Layer_1"> + <path + d="M 127.81817,87.825173 C 129.67917,103.42042 21.989175,123.45549 17.081175,104.65643 C 12.174175,85.855280 2.1931746,29.250351 1.0841746,23.409573 C -0.025825402,17.568794 111.16117,1.8931647 111.81917,6.5772713 C 112.47617,11.261378 125.95317,72.227839 127.81817,87.825173 z " + id="path1716" + style="fill:url(#XMLID_1_)" /><path + d="M 124.82002,86.233211 C 125.79544,93.680770 113.50726,100.54412 78.405838,105.83457 C 29.797840,113.16268 23.126889,113.85833 20.519977,104.00664 C 15.541863,85.199327 5.9298363,31.448190 4.7737780,25.598871 C 3.6187343,19.749533 108.25665,2.3575140 108.96323,7.0548317 C 109.66973,11.748770 122.77228,70.595456 124.82002,86.233211 z " + id="path1723" + style="fill:#d1d1d1;fill-opacity:1.0000000" /><path + id="path1741" + style="fill:#ffffff;stroke:#000000" + d="" /><path + d="M 114.73417,76.613763 C 115.45017,83.738518 30.508175,97.270824 28.334175,89.492570 C 24.565175,76.010462 15.476175,33.639362 15.033175,28.504056 C 14.823175,26.071543 100.47617,13.639662 101.93817,17.161979 C 103.71217,21.441081 113.46517,64.025506 114.73417,76.613763 z " + id="path1743" + style="fill:#d1d1d1;fill-opacity:1.0000000" /><path + d="M 112.96317,76.297478 C 113.74417,80.063057 31.345175,93.277308 30.371175,88.823042 C 29.397175,84.365887 17.551175,29.530614 17.551175,29.530614 L 100.67117,17.956091 C 100.67117,17.956091 112.18317,72.529006 112.96317,76.297478 z " + id="path1745" + style="fill:#f5f5f9" /><path + d="M 100.55617,17.107495 L 16.577175,28.749806 L 29.576175,88.599713 C 30.796175,94.163016 93.202175,82.438115 93.831175,82.314230 C 114.27417,78.285566 113.96517,76.797985 113.76017,75.814588 L 113.76017,75.812667 L 113.76017,75.814588 L 101.31617,17.000897 L 100.55617,17.107495 z M 100.02717,18.758335 C 100.32417,20.162365 112.00617,75.368026 112.11117,75.867407 C 109.52617,78.403689 71.541175,85.378704 46.885175,87.817029 C 33.642175,89.127906 31.482175,88.366349 31.138175,88.139706 C 30.836175,86.757764 20.006175,36.893566 18.523175,30.057801 C 20.184175,29.828278 98.550175,18.962890 100.02717,18.758335 z " + id="path1752" + style="fill:#000000;fill-opacity:1.0000000" /><path + a:adobe-blending-mode="screen" + d="M 105.98917,63.463016 C 105.98917,63.463016 92.840175,40.295114 63.690175,65.440217 C 43.907175,82.504270 28.755175,73.564067 27.010175,64.061187 C 23.959175,47.461682 22.534175,47.426188 21.429175,39.568540 L 100.28317,27.111343 L 105.98917,63.463016 z " + id="path1891" + style="fill:url(#XMLID_18_)" /><path + d="M 0.94217460,22.023236 C 0.26817460,22.617231 0.21417460,23.195568 0.28717460,23.575557 L 1.3971746,29.664791 C 4.3371746,45.885351 12.147175,88.974538 16.296175,104.87879 C 19.460175,116.99567 58.779175,113.52356 84.434175,108.23084 C 106.44117,103.69392 129.60417,95.921879 128.62517,87.721824 C 127.36017,77.145786 120.80717,45.925020 116.47017,25.266721 C 114.43717,15.589505 112.83217,7.9458614 112.62217,6.4551317 C 112.57417,6.1148110 112.36417,5.6502629 111.62217,5.3579630 C 102.72017,1.8461880 7.5561746,16.176193 0.94217460,22.023236 z M 14.952175,19.164960 C 45.879175,12.067291 107.28317,4.7493528 111.05917,6.9760519 C 111.37117,8.9083634 112.84817,15.952792 114.88117,25.630008 C 119.21117,46.260120 125.75517,77.434954 127.01017,87.929566 C 127.68117,93.555292 110.04317,101.21877 84.118175,106.56578 C 53.475175,112.88676 20.315175,113.81585 17.864175,104.43303 C 13.732175,88.593504 5.9331746,45.552337 2.9951746,29.349525 C 2.9951746,29.349525 1.9641746,23.699784 1.9101746,23.400177 C 2.1691746,23.060900 3.8551746,21.710057 14.952175,19.164960 z " + id="path1923" + style="fill:#000000;fill-opacity:1.0000000" /><g + id="g1925"> + <linearGradient + y2="132.29289" + x2="35.785999" + y1="52.338402" + x1="36.586899" + gradientUnits="userSpaceOnUse" + id="XMLID_23_"> + <stop + id="stop1928" + style="stop-color:#9E9EAC" + offset="0" /> + <stop + id="stop1930" + style="stop-color:#42425B" + offset="1" /> + + + + </linearGradient> + + + + <linearGradient + gradientTransform="matrix(0.962300,0.272200,-0.272200,0.962300,33.15460,32.60870)" + y2="51.923401" + x2="30.674400" + y1="38.364300" + x1="8.6763000" + gradientUnits="userSpaceOnUse" + id="XMLID_24_"> + <stop + id="stop1937" + style="stop-color:#FFFFFF" + offset="0" /> + <stop + id="stop1939" + style="stop-color:#DCDCE0" + offset="1" /> + + + + </linearGradient> + + + <linearGradient + gradientTransform="matrix(0.962300,0.272200,-0.272200,0.962300,33.15460,32.60870)" + y2="74.467400" + x2="18.130600" + y1="62.927700" + x1="14.248000" + gradientUnits="userSpaceOnUse" + id="XMLID_25_"> + <stop + id="stop1944" + style="stop-color:#FFFFFF" + offset="0" /> + <stop + id="stop1946" + style="stop-color:#DCDCE0" + offset="1" /> + + + + </linearGradient> + + + + <linearGradient + gradientTransform="matrix(-0.279700,0.981500,-1.218600,-0.347400,50.63740,141.2638)" + y2="22.446800" + x2="-56.447201" + y1="21.737301" + x1="-68.426804" + gradientUnits="userSpaceOnUse" + id="XMLID_26_"> + <stop + id="stop1953" + style="stop-color:#DCDCE0" + offset="0" /> + <stop + id="stop1955" + style="stop-color:#BEBEC2" + offset="1" /> + + + + </linearGradient> + + + <linearGradient + gradientTransform="matrix(-0.274100,0.961700,-0.961700,-0.274100,24.23770,133.5791)" + y2="-1.5967000" + x2="-67.696297" + y1="3.6680000" + x1="-56.356400" + gradientUnits="userSpaceOnUse" + id="XMLID_27_"> + <stop + id="stop1960" + style="stop-color:#0054BF" + offset="0" /> + <stop + id="stop1962" + style="stop-color:#0047BF" + offset="1" /> + + + + </linearGradient> + + + <linearGradient + gradientTransform="matrix(-0.274100,0.961700,-0.816500,-0.232800,9.573000,128.7048)" + y2="-19.257999" + x2="-66.917702" + y1="-14.327600" + x1="-56.297901" + gradientUnits="userSpaceOnUse" + id="XMLID_28_"> + <stop + id="stop1967" + style="stop-color:#0054BF" + offset="0" /> + <stop + id="stop1969" + style="stop-color:#5FA0FF" + offset="1" /> + + + + </linearGradient> + + + <linearGradient + gradientTransform="matrix(-9.010000e-2,0.996000,-0.996000,-9.010000e-2,18.98860,131.3304)" + y2="-15.773900" + x2="-62.960201" + y1="-16.911600" + x1="-65.541496" + gradientUnits="userSpaceOnUse" + id="XMLID_29_"> + <stop + id="stop1974" + style="stop-color:#BFE2FF" + offset="0" /> + <stop + id="stop1976" + style="stop-color:#5FA0FF" + offset="1" /> + + + + </linearGradient> + + </g> + <path + d="M 128.16900,118.23606 L 0.16900000,118.23606 L 0.16900000,-1.7097435e-14 L 128.16900,-1.7097435e-14 L 128.16900,118.23606 z " + id="path2062" + style="fill:none" /> + <path + sodipodi:type="arc" + style="fill:#cccccc;fill-opacity:1.0000000" + id="path3123" + sodipodi:cx="79.111282" + sodipodi:cy="83.275467" + sodipodi:rx="34.713203" + sodipodi:ry="5.3321223" + d="M 113.82449 83.275467 A 34.713203 5.3321223 0 1 1 44.398079,83.275467 A 34.713203 5.3321223 0 1 1 113.82449 83.275467 z" + transform="matrix(1.267730,-0.246140,0.133394,1.354468,-35.04176,4.335442)" /><path + sodipodi:type="arc" + style="fill:#79799c;fill-opacity:1.0000000" + id="path3127" + sodipodi:cx="79.111282" + sodipodi:cy="83.275467" + sodipodi:rx="34.713203" + sodipodi:ry="5.3321223" + d="M 113.82449 83.275467 A 34.713203 5.3321223 0 1 1 44.398079,83.275467 A 34.713203 5.3321223 0 1 1 113.82449 83.275467 z" + transform="matrix(1.216726,-0.238824,0.191990,0.958919,-35.88576,36.67426)" /><rect + style="fill:#cccccc;fill-opacity:1.0000000" + id="rect3857" + width="3.3490131" + height="11.841051" + x="35.321518" + y="104.04992" + transform="matrix(0.991862,-0.127320,0.360903,0.932603,0.000000,0.000000)" /></g> +</svg>
\ No newline at end of file diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index bd559b819..0bcc7f846 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -1,4 +1,4 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KMouseDlg</class> <widget class="TQWidget"> <property name="name"> @@ -12,6 +12,9 @@ <height>434</height> </rect> </property> + <property name="caption"> + <string>KMouseDlg</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> @@ -132,7 +135,18 @@ <string>Re&verse scroll direction</string> </property> <property name="whatsThis" stdset="0"> - <string>Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse buttons.</string> + <string>Change the direction of scrolling for the mouse wheel, if present.</string> + </property> + </widget> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>cbRevHistButtons</cstring> + </property> + <property name="text"> + <string>Swap &history navigation buttons</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Swap the two history navigation buttons on the mouse, if present.</string> </property> </widget> <widget class="TQGroupBox"> diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 2798ce1de..870f26047 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -68,18 +68,18 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag if ( mouseCapabilityFlags & HAS_RES ) { updateResolution(); - resolutionSelector->setEnabled( TRUE ); + resolutionSelector->setEnabled( true ); - connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); - connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( button400cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); + connect( button800cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( 4 == resolution() ) { - button800cpi->setChecked( TRUE ); + button800cpi->setChecked( true ); } else if ( 3 == resolution() ) { - button400cpi->setChecked( TRUE ); + button400cpi->setChecked( true ); } else { // it must have failed, try to help out - resolutionSelector->setEnabled(FALSE); + resolutionSelector->setEnabled(false); permissionProblemText->show(); } } @@ -90,22 +90,22 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag // Do a name cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) ); - cordlessNameLabel->setEnabled( TRUE ); + cordlessNameLabel->setEnabled( true ); // Display the battery power level - the level gets updated in updateGUI() - batteryBox->setEnabled( TRUE ); + batteryBox->setEnabled( true ); // Channel - channelSelector->setEnabled( TRUE ); + channelSelector->setEnabled( true ); // if the channel is changed, we need to turn off the timer, otherwise it // just resets the button to reflect the current status. The timer is // started again when we applyChanges() - connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); - connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( channel1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); + connect( channel1, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( isDualChannelCapable() ) { - channel2->setEnabled( TRUE ); - connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); - connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + channel2->setEnabled( true ); + connect( channel2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); + connect( channel2, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); } updateGUI(); @@ -124,7 +124,7 @@ void LogitechMouse::initCordlessStatusReporting() { updateCordlessStatus(); doUpdate = new TQTimer( this ); // will be automatically deleted - connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); + connect( doUpdate, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } @@ -144,8 +144,8 @@ void LogitechMouse::updateCordlessStatus() if (0 > result) { // We probably have a permission problem - channelSelector->setEnabled( FALSE ); - batteryBox->setEnabled( FALSE ); + channelSelector->setEnabled( false ); + batteryBox->setEnabled( false ); cordlessNameLabel->hide(); permissionProblemText->show(); } else { @@ -198,9 +198,9 @@ void LogitechMouse::updateGUI() if ( isDualChannelCapable() ) { if ( 2 == channel() ) { - channel2->setChecked( TRUE ); + channel2->setChecked( true ); } else if ( 1 == channel() ) { - channel1->setChecked( TRUE ); + channel1->setChecked( true ); } // else it might have failed - we don't do anything } } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index e50838b72..8c919a601 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -46,7 +46,7 @@ class LogitechMouse : public LogitechMouseBase { - Q_OBJECT + TQ_OBJECT public: LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 254f2ee5c..71d9ec66f 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -38,15 +38,17 @@ #endif #include "mouse.h" +#include "touchpad_settings.h" +#include "touchpad.h" extern "C" { - KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *) { return new MouseConfig(parent, "kcminput"); } - KDE_EXPORT void init_mouse() + TDE_EXPORT void init_mouse() { TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals MouseSettings settings; @@ -91,6 +93,23 @@ extern "C" delete config; } + + TDE_EXPORT TDECModule *create_touchpad(TQWidget *parent, const char *) + { + return new TouchpadConfig(parent, "kcminput"); + } + + TDE_EXPORT void init_touchpad() + { + TouchpadSettings settings; + settings.apply(); + } + + TDE_EXPORT bool test_touchpad() + { + TouchpadSettings settings; + return settings.foundTouchpad(); + } } diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 0d07e782e..576e2c376 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -61,7 +61,7 @@ #include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeaboutdata.h> @@ -102,8 +102,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) tabwidget->addTab(tab1, i18n("&General")); - connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); - connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int))); + connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); + connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotHandedChanged(int))); wtstr = i18n("If you are left-handed, you may prefer to swap the" " functions of the left and right buttons on your pointing device" @@ -113,7 +113,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) " a three-button mouse, the middle button is unaffected."); TQWhatsThis::add( tab1->handedBox, wtstr ); - connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(tab1->doubleClick, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); wtstr = i18n("The default behavior in TDE is to select and activate" " icons with a single click of the left button on your pointing" @@ -127,7 +127,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) TQWhatsThis::add( tab1->singleClick, wtstr ); - connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cbAutoSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); wtstr = i18n("If you check this option, pausing the mouse pointer" " over an icon on the screen will automatically select that icon." @@ -149,35 +149,33 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) wtstr = i18n("Show feedback when clicking an icon"); TQWhatsThis::add( tab1->cbVisualActivate, wtstr ); - connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->slAutoSelect, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(tab1->cbVisualActivate, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); - connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointershape, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); - connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); + connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClick())); - connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); - connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); + connect( tab1->doubleClick, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) ); + connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) ); - // Only allow setting reversing scroll polarity if we have scroll buttons unsigned char map[20]; - if ( XGetPointerMapping(kapp->getDisplay(), map, 20) >= 5 ) - { - tab1->cbScrollPolarity->setEnabled( true ); - tab1->cbScrollPolarity->show(); - } - else - { - tab1->cbScrollPolarity->setEnabled( false ); - tab1->cbScrollPolarity->hide(); - } - connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged())); + int buttonCount = XGetPointerMapping(tdeApp->getDisplay(), map, 20); + + // Only allow setting reversing scroll polarity if we have scroll buttons + tab1->cbScrollPolarity->setEnabled(buttonCount >= 5); + connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScrollPolarityChanged())); + + // Only allow setting reversing history buttons (8, 9) if we have actually have them + tab1->cbRevHistButtons->setEnabled(buttonCount >= 9); + connect(tab1->cbRevHistButtons, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(tab1->cbRevHistButtons, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRevHistButtonsChanged())); // Cursor theme tab themetab = new ThemePage(this); - connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed())); + connect(themetab, TQ_SIGNAL(changed(bool)), TQ_SLOT(changed())); tabwidget->addTab(themetab, i18n("&Cursor Theme")); // Advanced tab @@ -191,7 +189,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) accel->setLabel(i18n("Pointer acceleration:")); accel->setSuffix("x"); lay->addWidget(accel); - connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); + connect(accel, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); wtstr = i18n("This option allows you to change the relationship" " between the distance that the mouse pointer moves on the" @@ -210,8 +208,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) thresh->setRange(0,20,1); thresh->setSteps(1,1); lay->addWidget(thresh); - connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int))); + connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreshChanged(int))); slotThreshChanged(thresh->value()); wtstr = i18n("The threshold is the smallest distance that the" @@ -231,7 +229,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) doubleClickInterval->setSuffix(i18n(" msec")); doubleClickInterval->setSteps(100, 100); lay->addWidget(doubleClickInterval); - connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(doubleClickInterval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); wtstr = i18n("The double click interval is the maximal time" " (in milliseconds) between two mouse clicks which" @@ -245,16 +243,17 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) doubleClickLabel = new TQLabel(i18n("Double-click on the image below to test your double-click interval:"), tab2); lay->addWidget(doubleClickLabel); - wtstr = i18n("The image will change when your double-click" + wtstr = i18n("<p>The image will change when your double-click" " test time is less than or equal to the interval you" - " configured. When changing the interval, be sure to select" - " the Apply button before testing. For example, the image" - " will not change when you configure a double-click interval" - " of 700 milliseconds and the time between two successive" - " clicks on the image is 800 milliseconds, but the image will" - " change when the time between clicks is 600 milliseconds." + " configured. For example, if you configure a double-click interval" + " of 700 milliseconds the image will not change when the time between" + " two successive clicks on the image is 800 milliseconds, but the image" + " will change when the time between clicks is 600 milliseconds." " The goal is to select a comfortable interval that you find" - " is not too fast or slow."); + " is not too fast or slow.</p>" + "" + " <p>When changing the interval it is not necessary to push" + " the <i>Apply</i> button before testing.</p>"); TQWhatsThis::add( doubleClickLabel, wtstr ); doubleClickStatus = false; // First image will be displayed doubleClickButton = new TQPushButton( tab2 ); @@ -267,9 +266,9 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) lay->addWidget(doubleClickButton); // Use the same What's This help for the pushbutton. TQWhatsThis::add( doubleClickButton, wtstr ); - connect(doubleClickButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDoubleClickButtonPressed())); + connect(doubleClickButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDoubleClickButtonPressed())); doubleClickTimer=new TQTimer(); - connect(doubleClickTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoubleClickTimerDone()) ); + connect(doubleClickTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoubleClickTimerDone()) ); lay->addSpacing(10); @@ -279,7 +278,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) dragStartTime->setSuffix(i18n(" msec")); dragStartTime->setSteps(100, 100); lay->addWidget(dragStartTime); - connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(dragStartTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); wtstr = i18n("If you click with the mouse (e.g. in a multi-line" " editor) and begin to move the mouse within the" @@ -291,8 +290,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) dragStartDist->setRange(1, 20, 1); dragStartDist->setSteps(1,1); lay->addWidget(dragStartDist); - connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int))); + connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDragStartDistChanged(int))); slotDragStartDistChanged(dragStartDist->value()); wtstr = i18n("If you click with the mouse and begin to move the" @@ -305,8 +304,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) wheelScrollLines->setRange(1, 12, 1); wheelScrollLines->setSteps(1,1); lay->addWidget(wheelScrollLines); - connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int))); + connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWheelScrollLinesChanged(int))); slotWheelScrollLinesChanged(wheelScrollLines->value()); wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement."); @@ -365,13 +364,13 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) mk_curve->setRange(-1000, 1000, 100); hbox->addWidget(mk_curve); - connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(mk_delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_interval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_time_to_max, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_max_speed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_curve, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); vbox->addStretch(); } @@ -435,7 +434,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) load(); TDEAboutData* about = new TDEAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0, - TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); about->addAuthor("Patrick Dowler", 0, 0); about->addAuthor("Dirk A. Mueller", 0, 0); about->addAuthor("David Faure", 0, 0); @@ -521,9 +520,12 @@ void MouseConfig::load( bool useDefaults ) tab1->rightHanded->setEnabled(settings->handedEnabled); tab1->leftHanded->setEnabled(settings->handedEnabled); - if ( tab1->cbScrollPolarity->isEnabled() ) - tab1->cbScrollPolarity->setEnabled(settings->handedEnabled); + if (tab1->cbScrollPolarity->isEnabled()) + tab1->cbScrollPolarity->setEnabled(settings->handedEnabled); + if (tab1->cbRevHistButtons->isEnabled()) + tab1->cbRevHistButtons->setEnabled(settings->handedEnabled); tab1->cbScrollPolarity->setChecked( settings->reverseScrollPolarity ); + tab1->cbRevHistButtons->setChecked( settings->reverseHistoryButtons ); setAccel(settings->accelRate); setThreshold(settings->thresholdMove); @@ -596,6 +598,7 @@ void MouseConfig::save() // settings->changeCursor = tab1->singleClick->isChecked(); settings->changeCursor = tab1->cb_pointershape->isChecked(); settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked(); + settings->reverseHistoryButtons = tab1->cbRevHistButtons->isChecked(); settings->apply(); TDEConfig config( "kcminputrc" ); @@ -621,7 +624,7 @@ void MouseConfig::save() themetab->save(); // restart kaccess - kapp->startServiceByDesktopName("kaccess"); + tdeApp->startServiceByDesktopName("kaccess"); TDECModule::changed(false); @@ -683,14 +686,14 @@ void MouseSettings::load(TDEConfig *config) { int accel_num, accel_den, threshold; double accel; - XGetPointerControl( kapp->getDisplay(), + XGetPointerControl( tdeApp->getDisplay(), &accel_num, &accel_den, &threshold ); accel = float(accel_num) / float(accel_den); // get settings from X server int h = RIGHT_HANDED; unsigned char map[20]; - num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20); + num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20); handedEnabled = true; @@ -745,6 +748,7 @@ void MouseSettings::load(TDEConfig *config) else if (key == NULL) handed = h; reverseScrollPolarity = config->readBoolEntry( "ReverseScrollPolarity", false ); + reverseHistoryButtons = config->readBoolEntry( "ReverseHistoryButtons", false ); m_handedNeedsApply = false; // SC/DC/AutoSelect/ChangeCursor @@ -777,14 +781,14 @@ void MouseConfig::slotWheelScrollLinesChanged(int value) void MouseSettings::apply(bool force) { - XChangePointerControl( kapp->getDisplay(), + XChangePointerControl( tdeApp->getDisplay(), true, true, int(tqRound(accelRate*10)), 10, thresholdMove); - // 256 might seems extreme, but X has already been known to return 32, + // 256 might seems extreme, but X has already been known to return 32, // and we don't want to truncate things. Xlib limits the table to 256 bytes, // so it's a good uper bound.. unsigned char map[256]; - num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256); + num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 256); int remap=(num_buttons>=1); if (handedEnabled && (m_handedNeedsApply || force)) { @@ -835,10 +839,25 @@ void MouseSettings::apply(bool force) map[pos+1] = reverseScrollPolarity ? (unsigned char) 4 : (unsigned char) 5; } } + // 8,9 => history navigation buttons + // Logic is same as above with buttons 4 and 5, we find the buttons + // in the mapping, then, if needed, reverse them. + if (num_buttons >= 9) + { + int pos; + for( pos = 0; pos < num_buttons; ++pos ) + if( map[pos] == 8 || map[pos] == 9 ) + break; + if( pos < num_buttons - 1 ) + { + map[pos] = reverseHistoryButtons ? (unsigned char) 9 : (unsigned char) 8; + map[pos+1] = reverseHistoryButtons ? (unsigned char) 8 : (unsigned char) 9; + } + } } int retval; if (remap) - while ((retval=XSetPointerMapping(kapp->getDisplay(), map, + while ((retval=XSetPointerMapping(tdeApp->getDisplay(), map, num_buttons)) == MappingBusy) /* keep trying until the pointer is free */ { }; @@ -864,6 +883,7 @@ void MouseSettings::save(TDEConfig *config) else config->writeEntry("MouseButtonMapping",TQString("LeftHanded")); config->writeEntry( "ReverseScrollPolarity", reverseScrollPolarity ); + config->writeEntry( "ReverseHistoryButtons", reverseHistoryButtons ); config->setGroup("KDE"); config->writeEntry("DoubleClickInterval", doubleClickInterval, true, true); @@ -890,6 +910,11 @@ void MouseConfig::slotScrollPolarityChanged() settings->m_handedNeedsApply = true; } +void MouseConfig::slotRevHistButtonsChanged() +{ + settings->m_handedNeedsApply = true; +} + TQString MouseConfig::handbookSection() const { int index = tabwidget->currentPageIndex(); diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 6d035b8d1..22d0aa84c 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -83,16 +83,16 @@ public: bool changeCursor; int wheelScrollLines; bool reverseScrollPolarity; + bool reverseHistoryButtons; #ifdef HAVE_LIBUSB - // TODO: In Qt4, replace with a better container. TQPtrList <LogitechMouse> logitechMouseList; #endif }; class MouseConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: MouseConfig(TQWidget *parent=0, const char* name=0); ~MouseConfig(); @@ -112,6 +112,7 @@ private slots: /** No descriptions */ void slotHandedChanged(int val); void slotScrollPolarityChanged(); + void slotRevHistButtonsChanged(); void checkAccess(); void slotThreshChanged(int value); void slotDragStartDistChanged(int value); diff --git a/kcontrol/input/pics/CMakeLists.txt b/kcontrol/input/pics/CMakeLists.txt deleted file mode 100644 index 0c9331efe..000000000 --- a/kcontrol/input/pics/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -install( FILES - mouse_rh.png mouse_lh.png doubleclick_1.png doubleclick_2.png - DESTINATION ${DATA_INSTALL_DIR}/kcminput/pics ) diff --git a/kcontrol/input/pics/mouse0.png b/kcontrol/input/pics/mouse0.png Binary files differnew file mode 100644 index 000000000..02e708b04 --- /dev/null +++ b/kcontrol/input/pics/mouse0.png diff --git a/kcontrol/input/pics/mouse1.png b/kcontrol/input/pics/mouse1.png Binary files differnew file mode 100644 index 000000000..f3aeea106 --- /dev/null +++ b/kcontrol/input/pics/mouse1.png diff --git a/kcontrol/input/pics/mouse2.png b/kcontrol/input/pics/mouse2.png Binary files differnew file mode 100644 index 000000000..40c34fe59 --- /dev/null +++ b/kcontrol/input/pics/mouse2.png diff --git a/kcontrol/input/pics/mouse3.png b/kcontrol/input/pics/mouse3.png Binary files differnew file mode 100644 index 000000000..74e5c1423 --- /dev/null +++ b/kcontrol/input/pics/mouse3.png diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp new file mode 100644 index 000000000..c879c92a6 --- /dev/null +++ b/kcontrol/input/tdesyndaemon.cpp @@ -0,0 +1,207 @@ +/******************************************************************************* + tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad + on keyboard input + + Copyright © 2004 Nadeem Hasan <nhasan@kde.org> + Stefan Kombrink <katakombi@web.de> + 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +// TQt +#include <tqdatetime.h> +#include <tqtimer.h> + +// TDE +#include <tdesimpleconfig.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdelocale.h> +#include <kdebug.h> + +// DCOP +#include <dcopclient.h> + +// tdecm_touchpad +#include "touchpad_settings.h" + +// TDESynDaemon +#include "tdesyndaemon.h" +#include "tdesyndaemon.moc" + +const unsigned int TDESynDaemon::TIME_OUT = 300; +const unsigned int TDESynDaemon::POLL_INTERVAL = 100; +const unsigned int TDESynDaemon::KEYMAP_SIZE = 32; + +unsigned char* TDESynDaemon::m_keyboard_mask; + +TDESynDaemon::TDESynDaemon() : DCOPObject("tdesyndaemon"), TQObject() +{ + m_typing = false; + m_time = new TQTime(); + d_settings = new TouchpadSettings; + + m_keyboard_mask = new unsigned char[ KEYMAP_SIZE ]; + + // open a connection to the X server + m_display = XOpenDisplay(NULL); + + if (!m_display) kdError() << "Can't open display!" << endl; + + // setup keymap + XModifierKeymap *modifiers; + + for (unsigned int i = 0; i < KEYMAP_SIZE; ++i) + m_keyboard_mask[i] = 0xFF; + + modifiers = XGetModifierMapping(m_display); + for (int i = 0; i < 8 * modifiers->max_keypermod; ++i) + { + KeyCode kc = modifiers->modifiermap[i]; + if (kc != 0) clearBit(m_keyboard_mask, kc); + } + + XFreeModifiermap(modifiers); + + m_poll = new TQTimer(this); + connect(m_poll, TQ_SIGNAL(timeout()), this, TQ_SLOT(poll())); + m_poll->start(POLL_INTERVAL); +} + +TDESynDaemon::~TDESynDaemon() +{ + setTouchpadOn(true); + m_poll->stop(); + delete m_keyboard_mask; +} + +void TDESynDaemon::stop() +{ + tdeApp->quit(); +} + +void TDESynDaemon::poll() +{ + // do nothing if the user has explicitly disabled the touchpad in the settings + if (!touchpadEnabled()) return; + + if (hasKeyboardActivity()) + { + m_time->start(); + + if (!m_typing) + { + setTouchpadOn(false); + } + } + + else + { + if (m_typing && (m_time->elapsed() > TIME_OUT)) + { + setTouchpadOn(true); + } + } +} + +bool TDESynDaemon::touchpadEnabled() +{ + // We can't read from our own TouchpadSettings + // as it contains the currently applied value + // so we revert to this + TDESimpleConfig cfg("kcminputrc"); + cfg.setGroup("Touchpad"); + return cfg.readBoolEntry("Enabled", true); +} + +void TDESynDaemon::setTouchpadOn(bool on) +{ + m_typing = !on; + if (!d_settings->setTouchpadEnabled(on)) + { + kdWarning() << "unable to turn off touchpad!" << endl; + } +} + +void TDESynDaemon::clearBit(unsigned char *ptr, int bit) +{ + int byteNum = bit / 8; + int bitNum = bit % 8; + ptr[byteNum] &= ~(1 << bitNum); +} + +bool TDESynDaemon::hasKeyboardActivity() +{ + static unsigned char oldKeyState[KEYMAP_SIZE]; + unsigned char keyState[KEYMAP_SIZE]; + + bool result = false; + + XQueryKeymap(m_display, (char*)keyState); + + // find pressed keys + for (unsigned int i = 0; i < KEYMAP_SIZE; ++i) + { + if ((keyState[i] & ~oldKeyState[i]) & m_keyboard_mask[i]) + { + result = true; + break; + } + } + + // ignore any modifiers + for (unsigned int i = 0; i < KEYMAP_SIZE; ++i) + { + if (keyState[i] & ~m_keyboard_mask[i]) + { + result = false; + break; + } + } + + // back up key states... + for (unsigned int i = 0; i < KEYMAP_SIZE; ++i) + { + oldKeyState[i] = keyState[i]; + } + + return result; +} + +extern "C" TDE_EXPORT int main(int argc, char *argv[]) +{ + TDEAboutData aboutData( "tdesyndaemon", I18N_NOOP("TDE Synaptics helper daemon"), + "0.1", I18N_NOOP("TDE Synaptics helper daemon"), TDEAboutData::License_GPL_V2, + "© 2024 Mavridis Philippe" ); + + aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org"); + aboutData.addAuthor("Mavridis Philippe", I18N_NOOP("Author"), "mavridisf@gmail.com"); + + TDECmdLineArgs::init(argc, argv, &aboutData); + + TDEApplication app; + app.disableSessionManagement(); + if (app.dcopClient()->isApplicationRegistered("tdesyndaemon")) + { + kdWarning() << "TDESynDaemon already running, exiting..." << endl; + return 255; + } + app.dcopClient()->registerAs("tdesyndaemon", false); + app.dcopClient()->setDefaultObject("tdesyndaemon"); + + TDESynDaemon tdesyndaemon; + return app.exec(); +} diff --git a/kcontrol/input/tdesyndaemon.h b/kcontrol/input/tdesyndaemon.h new file mode 100644 index 000000000..47b799284 --- /dev/null +++ b/kcontrol/input/tdesyndaemon.h @@ -0,0 +1,78 @@ +/******************************************************************************* + tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad + on keyboard input + + Copyright © 2004 Nadeem Hasan <nhasan@kde.org> + Stefan Kombrink <katakombi@web.de> + 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +#ifndef __TDESYNDAEMON_H__ +#define __TDESYNDAEMON_H__ + +// TQt +#include <tqobject.h> +#include <tqthread.h> + +// DCOP +#include <dcopobject.h> + +// X11 +#include <X11/Xlib.h> +#undef Bool /* fix problems in --enable-final mode */ +#undef None /* fix problems in --enable-final mode */ + +// TDESynDaemon +#include "tdesyndaemon_iface.h" + + +class TQTimer; + +class TDESynDaemon : public TQObject, public virtual TDESynDaemonIface +{ + TQ_OBJECT + + public: + TDESynDaemon(); + ~TDESynDaemon(); + + bool touchpadEnabled(); + + public slots: + void poll(); + void setTouchpadOn(bool on); + virtual void stop(); + + protected: + void clearBit(unsigned char* ptr, int bit); + bool hasKeyboardActivity(); + + private: + TouchpadSettings *d_settings; + + TQTimer *m_poll; + TQTime *m_time; + Display *m_display; + bool m_typing; + + static const unsigned int POLL_INTERVAL; + static const unsigned int TIME_OUT; + static const unsigned int KEYMAP_SIZE; + static unsigned char *m_keyboard_mask; +}; + +#endif + diff --git a/kcontrol/input/tdesyndaemon_iface.h b/kcontrol/input/tdesyndaemon_iface.h new file mode 100644 index 000000000..68dc8a387 --- /dev/null +++ b/kcontrol/input/tdesyndaemon_iface.h @@ -0,0 +1,34 @@ +/******************************************************************************* + tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad + on keyboard input + + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +#ifndef __TDESYNDAEMON_IFACE_H__ +#define __TDESYNDAEMON_IFACE_H__ + +// DCOP +#include <dcopobject.h> + +class TDESynDaemonIface : virtual public DCOPObject +{ + K_DCOP + k_dcop: + virtual void stop() = 0; +}; + +#endif diff --git a/kcontrol/input/touchpad.cpp b/kcontrol/input/touchpad.cpp new file mode 100644 index 000000000..d18e3b698 --- /dev/null +++ b/kcontrol/input/touchpad.cpp @@ -0,0 +1,528 @@ +/******************************************************************************* + tdecm_touchpad + A touchpad module for the TDE Control Centre + + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +// TQt +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqlabel.h> + +// TDE +#include <tdeglobal.h> +#include <kiconloader.h> +#include <tdeaboutdata.h> +#include <kdialog.h> +#include <kdebug.h> + +// TouchpadConfig +#include "touchpad_settings.h" +#include "touchpad.h" +#include "touchpad.moc" + + +/******************************* TouchpadConfig *******************************/ +TouchpadConfig::TouchpadConfig(TQWidget *parent, const char *name) +: TDECModule(parent, name), + m_error(nullptr) +{ + TDEGlobal::iconLoader()->addAppDir("kcminput"); + + d_settings = new TouchpadSettings; + d_settings->apply(); + + if (!d_settings->supportedTouchpad()) + { + TQString error_str; + + if (!d_settings->foundTouchpad()) + { + error_str = i18n( + "<qt><h1>Touchpad not found</h1>" + "Please check your system installation.</qt>" + ); + } + + else IF_DRIVER(None) + { + error_str = i18n( + "<qt><h1>Unsupported driver</h1>" + "<p>This module only supports the following drivers:" + "<p>Libinput, Synaptics</qt>" + ); + } + + else error_str = i18n("<qt><h1>Unknown error</h1></qt>"); + + m_error = new TQLabel(error_str, this); + m_error->setAlignment(TQt::AlignCenter); + new TQVBoxLayout(this); + layout()->add(m_error); + return; + } + + initWidgets(); + load(); + + kdDebug() << "managed touchpad: " << d_settings->touchpad().name + << " (xid = " << d_settings->touchpad().id << ")" << endl; + + TDEAboutData* about = new TDEAboutData( + "tdecm_touchpad", + I18N_NOOP("Touchpad"), + 0, 0, + TDEAboutData::License_GPL, + I18N_NOOP("(c) 2024 Mavridis Philippe") + ); + about->addAuthor("Mavridis Philippe", 0, 0); + setAboutData(about); +} + +TouchpadConfig::~TouchpadConfig() +{ + DEL(m_error) + DEL(d_settings); +} + +void TouchpadConfig::initWidgets() +{ + // Create containers + m_container = new TQTabWidget(this); + + TQFrame *touchpadWidget = new TQFrame(this); + touchpadWidget->setMargin(0); + new TQVBoxLayout(touchpadWidget); + + // Enable option + TQFrame *enableCheckBox = new TQFrame(touchpadWidget); + enableCheckBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + + m_enabled = new TQCheckBox(i18n("Enable touchpad"), enableCheckBox); + TQWhatsThis::add(m_enabled, i18n( + "This option determines whether the touchpad is enabled or disabled" + )); + + // Compute margin for idented checkboxes based on checkbox height + int lmargin = m_enabled->height() / 2; + + // Align the Enable checkbox with the other options below + new TQHBoxLayout(enableCheckBox); + enableCheckBox->layout()->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed)); + enableCheckBox->layout()->add(m_enabled); + + // Settings frame + TQFrame *settingsFrame = new TQFrame(touchpadWidget); + TQGridLayout *grid = new TQGridLayout(settingsFrame, 3, 2, KDialog::spacingHint()); + + connect(m_enabled, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_enabled, TQ_SIGNAL(toggled(bool)), settingsFrame, TQ_SLOT(setEnabled(bool))); + + // Behaviour + m_behaviour = new TQGroupBox(2, TQt::Vertical, i18n("Behaviour"), settingsFrame); + + m_offWhileTyping = new TQCheckBox(i18n("Disable touchpad while typing"), m_behaviour); + TQWhatsThis::add(m_offWhileTyping, i18n( + "If this option is checked, the touchpad is disabled while you are typing, so as " + "to prevent accidental cursor movement and clicks." + )); + connect(m_offWhileTyping, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + + m_mbEmulation = new TQCheckBox(i18n("Middle button emulation"), m_behaviour); + TQWhatsThis::add(m_mbEmulation, i18n( + "If this option is enabled, a simultaneous left and right button click is " + "automatically transformed into a middle button click." + )); + IF_DRIVER(LibInput) + { + connect(m_mbEmulation, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + } + else + { + DISABLE_UNSUPPORTED_OPTION(m_mbEmulation); + } + + // Speed + m_speed = new TQGroupBox(4, TQt::Vertical, i18n("Speed"), settingsFrame); + + TQLabel *accelLabel = new TQLabel(i18n("Acceleration:"), m_speed); + + m_accel = new TQSlider(-100, 100, 5, 0, TQt::Horizontal, m_speed); + + TQWidget *accelSliderMarkBox = new TQWidget(m_speed); + new TQHBoxLayout(accelSliderMarkBox); + accelSliderMarkBox->layout()->setAutoAdd(true); + + TQLabel *l; + l = new TQLabel(i18n("Slower"), accelSliderMarkBox); + l->setAlignment(TQt::AlignLeft); + l = new TQLabel(i18n("Normal"), accelSliderMarkBox); + l->setAlignment(TQt::AlignHCenter); + l = new TQLabel(i18n("Faster"), accelSliderMarkBox); + l->setAlignment(TQt::AlignRight); + l = nullptr; + + m_accelAdaptive = new TQCheckBox(i18n("Use adaptive profile"), m_speed); + + IF_DRIVER(LibInput) + { + connect(m_accel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(m_accelAdaptive, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + + // check available profiles + TQValueList<bool> accelProfilesAvail = d_settings->getAccelProfilesAvailability(); + if (!accelProfilesAvail.count() || accelProfilesAvail[0] == 0 || accelProfilesAvail[1] == 0) + { + m_accelAdaptive->setEnabled(false); + } + } + else + { + DISABLE_UNSUPPORTED_OPTION(m_speed) + } + + // Tapping + m_tapping = new TQGroupBox(5, TQt::Vertical, i18n("Tapping"), settingsFrame); + + m_tapClick = new TQCheckBox(i18n("Tap to click"), m_tapping); + TQWhatsThis::add(m_tapClick, i18n( + "If this option is checked, a tap on the touchpad is interpreted as a button click." + )); + connect(m_tapClick, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_tapClick, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates())); + + m_tapDrag = new TQCheckBox(i18n("Tap-and-drag"), m_tapping); + TQWhatsThis::add(m_tapDrag, i18n( + "Tap-and-drag is a tap which is immediately followed by a finger down and that finger " + "being held down emulates a button press. Moving the finger around can thus drag the " + "selected item on the screen." + )); + connect(m_tapDrag, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_tapDrag, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates())); + + m_tapDragLock = new TQCheckBox(i18n("Tap-and-drag lock"), m_tapping); + TQWhatsThis::add(m_tapDragLock, i18n( + "When enabled, lifting a finger while dragging will not immediately stop dragging." + )); + + IF_DRIVER(LibInput) + { + connect(m_tapDragLock, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + } + else + { + DISABLE_UNSUPPORTED_OPTION(m_tapDragLock); + } + + TQLabel *tapMappingLabel = new TQLabel(i18n("Two-finger tap:"), m_tapping); + m_tapMapping = new TQComboBox(m_tapping); // "lrm" and "lmr" + m_tapMapping->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + m_tapMapping->insertItem( + TDEGlobal::iconLoader()->loadIcon("mouse3", TDEIcon::Small), + i18n("Right click (three-finger tap for middle click)"), + 0); + m_tapMapping->insertItem( + TDEGlobal::iconLoader()->loadIcon("mouse2", TDEIcon::Small), + i18n("Middle click (three-finger tap for right click)"), + 1); + connect(m_tapMapping, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(changed())); + + // Scrolling options + m_scrolling = new TQGroupBox(4, TQt::Vertical, i18n("Scrolling options"), settingsFrame); + + m_verScroll = new TQCheckBox(i18n("Vertical scrolling"), m_scrolling); + TQWhatsThis::add(m_verScroll, i18n( + "This option enables/disables the vertical scrolling gesture on the touchpad. " + "(The actual gesture depends on the selected scroll method.) " + "Unless the used driver is Synaptics, disabling vertical scrolling also disables " + "horizontal scrolling." + )); + connect(m_verScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_verScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates())); + + m_horScroll = new TQCheckBox(i18n("Horizontal scrolling"), m_scrolling); + TQWhatsThis::add(m_horScroll, i18n( + "This option enables/disables the horizontal scrolling gesture on the touchpad. " + "(The actual gesture depends on the selected scroll method.)" + )); + connect(m_horScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_horScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates())); + + m_naturalScroll = new TQCheckBox(i18n("Reverse scroll direction"), m_scrolling); + TQWhatsThis::add(m_naturalScroll, i18n( + "If this option is checked, the scrolling direction is reversed to resemble natural " + "movement of content. This feature is also called natural scrolling." + )); + connect(m_naturalScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + + m_naturalScrollDirections = new TQFrame(m_scrolling); + TQWhatsThis::add(m_naturalScrollDirections, i18n( + "This option allows you to select the scrolling directions to which reversed scrolling will be applied. " + "It is only available if the Synaptics driver is used." + )); + TQGridLayout *nsdl = new TQGridLayout(m_naturalScrollDirections, 2, 2, KDialog::spacingHint()); + m_horNaturalScroll = new TQCheckBox(i18n("Apply to horizontal scrolling"), m_naturalScrollDirections); + m_verNaturalScroll = new TQCheckBox(i18n("Apply to vertical scrolling"), m_naturalScrollDirections); + nsdl->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed), 0, 0); + nsdl->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed), 1, 0); + nsdl->addWidget(m_horNaturalScroll, 0, 1); + nsdl->addWidget(m_verNaturalScroll, 1, 1); + + IF_DRIVER(Synaptics) + { + connect(m_horNaturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_verNaturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_naturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWidgetStates())); + } + else + { + // Not only disable, but also force checkboxes to be checked on + // so that the user knows that the natural scrolling option applies + // always to both directions + DISABLE_UNSUPPORTED_OPTION(m_naturalScrollDirections); + m_horNaturalScroll->setChecked(true); + m_verNaturalScroll->setChecked(true); + } + + // Scrolling methods + m_scrollMethods = new TQButtonGroup(3, TQt::Vertical, i18n("Scrolling method"), settingsFrame); + TQWhatsThis::add(m_scrollMethods, i18n( + "Here you can select your preferred scrolling method. The two most common options are " + "two-finger scrolling and edge scrolling. Two-finger scrolling entails a movement with " + "two fingers vertically or horizontally upon the surface of the touchpad. Edge scrolling " + "on the other hand tracks movements with one finger along the right or bottom edge of " + "the touchpad." + )); + connect(m_scrollMethods, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); + + TQStringList scrollMethodLabels; + scrollMethodLabels << i18n("Two-finger") + << i18n("Edge"); + + IF_DRIVER(LibInput) + { + scrollMethodLabels << i18n("Button"); + } + + TQValueList<bool> scrollMethodAvail = d_settings->getScrollMethodsAvailability(); + Q_ASSERT(scrollMethodLabels.count() == scrollMethodAvail.count()); + + for (int i = 0; i < scrollMethodLabels.count(); ++i) + { + TQRadioButton *rad = new TQRadioButton(scrollMethodLabels[i], m_scrollMethods); + rad->setEnabled(scrollMethodAvail[i]); + } + + // Finalize layout + grid->addWidget(m_behaviour, 0, 0); + grid->addWidget(m_speed, 1, 0); + grid->addMultiCellWidget(m_scrolling, 0, 1, 1, 1); + grid->addWidget(m_scrollMethods, 2, 1); + grid->addWidget(m_tapping, 2, 0); + grid->addItem(new TQSpacerItem(10, 10)); + + // Synaptics deprecation warning + IF_DRIVER(Synaptics) + { + TQLabel *l = new TQLabel(i18n( + "<qt><b>Warning:</b> The Synaptics driver has been deprecated.</qt>" + ), settingsFrame); + TQWhatsThis::add(l, i18n( + "<qt><p><b>The Synaptics driver is no longer in active development.</b>" + "<p>While Libinput is the preferred choice for handling input devices, " + "you might still have valid reasons to use the older Synaptics driver " + "in its place. Please bear in mind that you will probably not receive " + "updates and bug fixes from its upstream.</qt>" + )); + grid->addMultiCellWidget(l, 3, 3, 0, 1); + } + + touchpadWidget->layout()->add(enableCheckBox); + touchpadWidget->layout()->add(settingsFrame); + m_container->addTab(touchpadWidget, SmallIconSet("input-touchpad"), d_settings->touchpad().name); + + new TQVBoxLayout(this, KDialog::marginHint()); + layout()->add(m_container); +} + +// We handle more complex UI cases here +void TouchpadConfig::updateWidgetStates() +{ + if (!d_settings->foundTouchpad()) return; + + // Scrolling related options + bool on; + + IF_DRIVER(LibInput) + { + // To disable vertical scrolling under LibInput one has to disable scrolling entirely + // so we mirror this in the UI + on = m_verScroll->isChecked(); + m_horScroll->setEnabled(on); + } + + else + { + // In case we can control both horizontal and vertical scrolling separately, any UI + // changes should be triggered when both are disabled + on = m_verScroll->isChecked() || m_horScroll->isChecked(); + + // Only enable natural scroll directions options when not under LibInput + m_naturalScrollDirections->setEnabled(on && m_naturalScroll->isChecked()); + } + + m_naturalScroll->setEnabled(on); + m_scrollMethods->setEnabled(on); + + // Tapping related options + m_tapDrag->setEnabled(m_tapClick->isChecked()); + + IF_DRIVER(LibInput) + { + m_tapDragLock->setEnabled(m_tapClick->isChecked() && m_tapDrag->isChecked()); + } +} + +void TouchpadConfig::defaults() +{ + load(true); +} + +void TouchpadConfig::load() +{ + load(false); +} + +void TouchpadConfig::load(bool useDefaults) +{ + if (!d_settings->foundTouchpad()) return; + + d_settings->load(); + + m_enabled->setChecked(d_settings->enabled); + + // Behaviour + m_offWhileTyping->setChecked(d_settings->offWhileTyping); + + IF_DRIVER(LibInput) + { + m_mbEmulation->setChecked(d_settings->midButtonEmulation); + } + + // Speed + IF_DRIVER(LibInput) + { + m_accel->setValue(d_settings->accelSpeed); + m_accelAdaptive->setChecked(d_settings->accelProfile == 0); + } + + // Tapping + m_tapClick->setChecked(d_settings->tapClick); + m_tapDrag->setChecked(d_settings->tapDrag); + + IF_DRIVER(LibInput) + { + m_tapDragLock->setChecked(d_settings->tapDragLock); + } + + m_tapMapping->setCurrentItem(d_settings->tapMapping); + + // Scrolling options + m_horScroll->setChecked(d_settings->scrollDirections & TQt::Horizontal); + m_verScroll->setChecked(d_settings->scrollDirections & TQt::Vertical); + m_naturalScroll->setChecked(d_settings->naturalScroll); + IF_DRIVER(Synaptics) + { + m_naturalScrollDirections->setEnabled(d_settings->naturalScroll); + m_horNaturalScroll->setChecked(d_settings->naturalScrollDirections & TQt::Horizontal); + m_verNaturalScroll->setChecked(d_settings->naturalScrollDirections & TQt::Vertical); + } + + IF_DRIVER(LibInput) + { + m_horScroll->setEnabled(m_verScroll->isOn()); + m_naturalScroll->setEnabled(m_verScroll->isOn()); + m_scrollMethods->setEnabled(m_verScroll->isOn()); + } + + // Scrolling method + m_scrollMethods->setButton(d_settings->scrollMethod); +} + +void TouchpadConfig::save() +{ + if (!d_settings->foundTouchpad()) return; + + d_settings->enabled = m_enabled->isChecked(); + + // Behaviour + d_settings->offWhileTyping = m_offWhileTyping->isChecked(); + + IF_DRIVER(LibInput) + { + d_settings->midButtonEmulation = m_mbEmulation->isChecked(); + } + + // Speed + IF_DRIVER(LibInput) + { + d_settings->accelSpeed = m_accel->value(); + d_settings->accelProfile = (m_accelAdaptive->isChecked() ? 0 : 1); + } + + // Tapping + d_settings->tapClick = m_tapClick->isChecked(); + d_settings->tapDrag = m_tapDrag->isChecked(); + + IF_DRIVER(LibInput) + { + d_settings->tapDragLock = m_tapDragLock->isChecked(); + } + + d_settings->tapMapping = m_tapMapping->currentItem(); + + // Scrolling options + int scrollDirections = 0; + if (m_horScroll->isChecked()) scrollDirections |= TQt::Horizontal; + if (m_verScroll->isChecked()) scrollDirections |= TQt::Vertical; + d_settings->scrollDirections = scrollDirections; + + d_settings->naturalScroll = m_naturalScroll->isChecked(); + + int naturalScrollDirections = 0; + if (m_horNaturalScroll->isChecked()) naturalScrollDirections |= TQt::Horizontal; + if (m_verNaturalScroll->isChecked()) naturalScrollDirections |= TQt::Vertical; + d_settings->naturalScrollDirections = naturalScrollDirections; + + // Scrolling method + d_settings->scrollMethod = m_scrollMethods->selectedId(); + + d_settings->save(); + d_settings->apply(); +} + +Touchpad TouchpadConfig::touchpad() +{ + return d_settings->touchpad(); +} diff --git a/kcontrol/input/touchpad.desktop b/kcontrol/input/touchpad.desktop new file mode 100644 index 000000000..d943749c1 --- /dev/null +++ b/kcontrol/input/touchpad.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Exec=tdecmshell touchpad +Icon=input-touchpad +Type=Application +X-DocPath=kcontrol/touchpad/index.html + +X-TDE-Library=input +X-TDE-FactoryName=touchpad +X-TDE-Init=touchpad +X-TDE-ParentApp=kcontrol +X-TDE-Test-Module=true + +Name=Touchpad +Comment=Touchpad settings +Keywords=Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;Click;mapping;right handed;left handed; +Categories=Qt;TDE;X-TDE-settings-hardware;
\ No newline at end of file diff --git a/kcontrol/input/touchpad.h b/kcontrol/input/touchpad.h new file mode 100644 index 000000000..088f7164a --- /dev/null +++ b/kcontrol/input/touchpad.h @@ -0,0 +1,97 @@ +/******************************************************************************* + tdecm_touchpad + A touchpad module for the TDE Control Centre + + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +#ifndef __TOUCHPAD_H__ +#define __TOUCHPAD_H__ + +// TDE +#include <tdecmodule.h> +#include <tdelocale.h> + +// Macros +#define OPTION_NOT_SUPPORTED I18N_NOOP("This option is not compatible with the currently used driver") +#define DISABLE_UNSUPPORTED_OPTION(optionWidget) \ + optionWidget->setEnabled(false); \ + TQToolTip::add(optionWidget, i18n(OPTION_NOT_SUPPORTED)); + +// Forward definitions +class TQTabWidget; +class TQButtonGroup; +class TQGroupBox; +class TQCheckBox; +class TQComboBox; +class TQSlider; +class TQLabel; +class TQFrame; +class TDEConfig; +class TouchpadSettings; +struct Touchpad; + + +/******************************* TouchpadConfig *******************************/ +class TouchpadConfig : public TDECModule +{ + TQ_OBJECT + + public: + TouchpadConfig(TQWidget *parent, const char *name); + ~TouchpadConfig(); + + void load(); + void load(bool useDefaults); + void save(); + void defaults(); + + Touchpad touchpad(); + + protected: + void initWidgets(); + + protected slots: + void updateWidgetStates(); + + private: + TouchpadSettings *d_settings; + + TQTabWidget *m_container; + TQLabel *m_error; + TQCheckBox *m_enabled; + + TQGroupBox *m_behaviour; + TQCheckBox *m_offWhileTyping, *m_leftHanded, *m_mbEmulation; + + TQGroupBox *m_speed; + TQSlider *m_accel; + TQCheckBox *m_accelAdaptive; + + TQGroupBox *m_tapping; + TQCheckBox *m_tapClick, *m_tapDrag, *m_tapDragLock; + TQComboBox *m_tapMapping; + + TQGroupBox *m_scrolling; + TQCheckBox *m_horScroll, *m_verScroll, *m_naturalScroll, + *m_horNaturalScroll, *m_verNaturalScroll; + + TQFrame *m_naturalScrollDirections; + + TQButtonGroup *m_scrollMethods; +}; + +#endif // __TOUCHPAD_H__ diff --git a/kcontrol/input/touchpad_settings.cpp b/kcontrol/input/touchpad_settings.cpp new file mode 100644 index 000000000..ba910c607 --- /dev/null +++ b/kcontrol/input/touchpad_settings.cpp @@ -0,0 +1,409 @@ +/******************************************************************************* + tdecm_touchpad + A touchpad module for the TDE Control Centre + + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +// TDE +#include <tdeapplication.h> +#include <tdeconfig.h> +#include <kdebug.h> + +// DCOP +#include <dcopref.h> + +// X11 +#include <X11/extensions/XInput.h> +#include <X11/extensions/XInput2.h> + +// tdecm_touchpad +#include "xiproperty.h" +#include "touchpad_settings.h" + + +/****************************** TouchpadSettings ******************************/ +TouchpadSettings::TouchpadSettings() +: m_foundTouchpad(false) +{ + findTouchpad(); +} + +bool TouchpadSettings::findTouchpad() +{ + Display *display = tqt_xdisplay(); + ATOM(isTouchpad, XI_TOUCHPAD) + ATOM(isLibinput, "libinput Send Events Mode Enabled") + ATOM(isSynaptics, "Synaptics Off") + + int devicesCount; + XDeviceInfo *deviceList = XListInputDevices(display, &devicesCount); + + for (int d = 0; d < devicesCount; ++d) + { + if (deviceList[d].type != isTouchpad) continue; + + m_foundTouchpad = true; + m_touchpad.init(deviceList[d].id, deviceList[d].name); + + int propertiesCount; + Atom *propertiesList = XIListProperties(display, deviceList[d].id, + &propertiesCount); + for (int p = 0; p < propertiesCount; ++p) + { + if (propertiesList[p] == isLibinput) + { + m_touchpad.driver = Touchpad::Driver::LibInput; + break; + } + + else if (propertiesList[p] == isSynaptics) + { + m_touchpad.driver = Touchpad::Driver::Synaptics; + } + } + + XFree(propertiesList); + + if (m_foundTouchpad) break; + } + + XFreeDeviceList(deviceList); + + return m_foundTouchpad; +} + +void TouchpadSettings::load(bool defaults) +{ + TDEConfig cfg("kcminputrc"); + cfg.setGroup("Touchpad"); + cfg.setReadDefaults(defaults); + + enabled = cfg.readBoolEntry("Enabled", true); + + // Behaviour + offWhileTyping = cfg.readBoolEntry("OffWhileTyping", false); + + IF_DRIVER(LibInput) + { + midButtonEmulation = cfg.readBoolEntry("MidButtonEmulation", false); + } + + // Speed + IF_DRIVER(LibInput) + { + accelSpeed = cfg.readNumEntry("AccelSpeed", 0); + accelProfile = cfg.readNumEntry("AccelProfile", 0); + } + + // Tapping + tapClick = cfg.readBoolEntry("TapToClick", true); + tapDrag = cfg.readBoolEntry("TapAndDrag", true); + + IF_DRIVER(LibInput) + { + tapDragLock = cfg.readBoolEntry("TapAndDragLock", false); + } + + tapMapping = cfg.readNumEntry("TapMapping", 0); + + // Scrolling options + int both = TQt::Horizontal | TQt::Vertical; + scrollDirections = cfg.readNumEntry("ScrollDirections", both); + naturalScroll = cfg.readBoolEntry("NaturalScroll", false); + naturalScrollDirections = cfg.readNumEntry("NaturalScrollDirections", both); + + // Scrolling method + scrollMethod = cfg.readNumEntry("ScrollMethod", 0); +} + +void TouchpadSettings::save() +{ + TDEConfig cfg("kcminputrc"); + cfg.setGroup("Touchpad"); + + cfg.writeEntry("Enabled", enabled); + + // Behaviour + cfg.writeEntry("OffWhileTyping", offWhileTyping); + + IF_DRIVER(LibInput) + { + cfg.writeEntry("MidButtonEmulation", midButtonEmulation); + } + + // Speed + cfg.writeEntry("AccelSpeed", accelSpeed); + cfg.writeEntry("AccelProfile", accelProfile); + + // Tapping + cfg.writeEntry("TapToClick", tapClick); + cfg.writeEntry("TapAndDrag", tapDrag); + + IF_DRIVER(LibInput) + { + cfg.writeEntry("TapAndDragLock", tapDragLock); + } + + cfg.writeEntry("TapMapping", tapMapping); + + // Scrolling options + cfg.writeEntry("ScrollDirections", scrollDirections); + cfg.writeEntry("NaturalScroll", naturalScroll); + cfg.writeEntry("NaturalScrollDirections", naturalScrollDirections); + + // Scrolling method + cfg.writeEntry("ScrollMethod", scrollMethod); + + cfg.sync(); +} + +bool TouchpadSettings::setTouchpadEnabled(bool on) +{ + enabled = on; + + XIProperty *prop = nullptr; + int fail = 0; + + IF_DRIVER(LibInput) + { + SET_PROP("Device Enabled", b) + { + prop->b[0] = enabled; + prop->set(); + } + } + + else + IF_DRIVER(Synaptics) + { + SET_PROP("Synaptics Off", b) + { + prop->b[0] = !enabled; + prop->set(); + } + } + + return !fail; +} + +void TouchpadSettings::apply(bool force) +{ + kdDebug() << "applying touchpad settings" << endl; + if (!foundTouchpad()) + { + kdWarning() << "no supported touchpads! settings not applied" << endl; + return; + } + + load(); + + Display *display = tqt_xdisplay(); + XIProperty *prop = nullptr; + int fail = 0; + + if (!setTouchpadEnabled(enabled)) + ++fail; + + IF_DRIVER(LibInput) + { + kdDebug() << "driver: libinput" << endl; + + SET_PROP("libinput Disable While Typing Enabled", b) + { + prop->b[0] = offWhileTyping; + prop->set(); + } + + SET_PROP("libinput Middle Emulation Enabled", b) + { + prop->b[0] = midButtonEmulation; + prop->set(); + } + + SET_PROP("libinput Accel Speed", f) + { + float val = accelSpeed; + val /= 100; + prop->f[0] = val; + prop->set(); + } + + SET_PROP("libinput Accel Profile Enabled", b) + { + prop->b[0] = (accelProfile == 0); + prop->b[1] = (accelProfile == 1); + prop->set(); + } + + SET_PROP("libinput Tapping Enabled", b) + { + prop->b[0] = tapClick; + prop->set(); + } + + SET_PROP("libinput Tapping Drag Enabled", b) + { + prop->b[0] = tapClick && tapDrag; + prop->set(); + } + + SET_PROP("libinput Tapping Drag Lock Enabled", b) + { + prop->b[0] = tapClick && tapDrag && tapDragLock; + prop->set(); + } + + SET_PROP("libinput Tapping Button Mapping Enabled", b) + { + prop->b[0] = (tapMapping == 0); + prop->b[1] = (tapMapping == 1); + prop->set(); + } + + SET_PROP("libinput Horizontal Scroll Enabled", b) + { + prop->b[0] = scrollDirections & TQt::Horizontal; + prop->set(); + } + + SET_PROP("libinput Natural Scrolling Enabled", b) + { + prop->b[0] = naturalScroll; + prop->set(); + } + + SET_PROP("libinput Scroll Method Enabled", b) + { + prop->b[0] = scrollDirections ? (scrollMethod == 0) : 0; // two-finger + prop->b[1] = scrollDirections ? (scrollMethod == 1) : 0; // edge + prop->b[2] = scrollDirections ? (scrollMethod == 2) : 0; // button + prop->set(); + } + } + + else IF_DRIVER(Synaptics) + { + kdDebug() << "driver: synaptics" << endl; + + SET_PROP("Synaptics Tap Action", b) + { + prop->b[0] = 0; + prop->b[1] = 0; + prop->b[2] = 0; + prop->b[3] = 0; + prop->b[4] = tapClick ? 1 : 0; // 1 finger + prop->b[5] = tapClick ? (tapMapping == 0 ? 3 : 2) : 0; // 2 fingers + prop->b[6] = tapClick ? (tapMapping == 0 ? 2 : 3) : 0; // 3 fingers + prop->set(); + } + + SET_PROP("Synaptics Gestures", b) + { + prop->b[0] = tapDrag; + prop->set(); + } + + SET_PROP("Synaptics Edge Scrolling", b) + { + prop->b[0] = scrollMethod == 1 ? (scrollDirections & TQt::Vertical ? 1 : 0) : 0; + prop->b[1] = scrollMethod == 1 ? (scrollDirections & TQt::Horizontal ? 1 : 0) : 0; + prop->b[2] = 0; // corner + prop->set(); + } + + SET_PROP("Synaptics Two-Finger Scrolling", b) + { + prop->b[0] = scrollMethod == 0 ? (scrollDirections & TQt::Vertical ? 1 : 0) : 0; + prop->b[1] = scrollMethod == 0 ? (scrollDirections & TQt::Horizontal ? 1 : 0) : 0; + prop->set(); + } + + SET_PROP("Synaptics Scrolling Distance", i) + { + prop->i[0] = naturalScroll && naturalScrollDirections & TQt::Vertical ? -80 : 80; + prop->i[1] = naturalScroll && naturalScrollDirections & TQt::Horizontal ? -80 : 80; + prop->set(); + } + + // start/stop tdesyndaemon + DCOPRef tdesyndaemon("tdesyndaemon", "tdesyndaemon"); + tdesyndaemon.call("stop()"); + + if (offWhileTyping) + { + tdeApp->tdeinitExec("tdesyndaemon"); + } + } + + if (fail > 0) + kdWarning() << "some options could not be applied!" << endl; +} + +TQValueList<bool> TouchpadSettings::getScrollMethodsAvailability() +{ + TQValueList<bool> avail; + + IF_DRIVER(LibInput) + { + PROP(propScrollMethodsAvail, "libinput Scroll Methods Available") + for (int i = 0; i < propScrollMethodsAvail.count(); ++i) + { + avail.append(propScrollMethodsAvail[i].toBool()); + } + } + + IF_DRIVER(Synaptics) + { + avail.append(1); // two-finger + avail.append(1); // edge + } + + return avail; +} + +TQValueList<bool> TouchpadSettings::getAccelProfilesAvailability() +{ + TQValueList<bool> avail; + + IF_DRIVER(LibInput) + { + PROP(propAccelProfilesAvail, "libinput Accel Profiles Available") + for (int i = 0; i < propAccelProfilesAvail.count(); ++i) + { + avail.append(propAccelProfilesAvail[i].toBool()); + } + } + + IF_DRIVER(Synaptics) { /* TODO no support yet */ } + + return avail; +} + +Touchpad TouchpadSettings::touchpad() +{ + return m_touchpad; +} + +bool TouchpadSettings::foundTouchpad() +{ + return m_foundTouchpad; +} + +bool TouchpadSettings::supportedTouchpad() +{ + return m_foundTouchpad && m_touchpad.driver != Touchpad::Driver::None; +} diff --git a/kcontrol/input/touchpad_settings.h b/kcontrol/input/touchpad_settings.h new file mode 100644 index 000000000..8cdfea951 --- /dev/null +++ b/kcontrol/input/touchpad_settings.h @@ -0,0 +1,107 @@ +/******************************************************************************* + tdecm_touchpad + A touchpad module for the TDE Control Centre + + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +#ifndef __TOUCHPAD_SETTINGS_H__ +#define __TOUCHPAD_SETTINGS_H__ + +// TQt +#include <tqvaluelist.h> + +// Macros +#define DEL(var) \ + if (var) { delete var; var = nullptr; } + +#define ATOM(var, atom) \ + Atom var = XInternAtom(display, atom, true); + +#define PROP(var, property) \ + XIProperty var = XIProperty(m_touchpad.id, property); + +#define SET_PROP(property, type) \ + DEL(prop) \ + prop = new XIProperty(m_touchpad.id, property); \ + if (prop->type == nullptr) \ + { \ + kdWarning() << "Failed to set property " << property << endl; \ + ++fail; \ + } \ + else + +#define IF_DRIVER(drv) \ + if (touchpad().driver == Touchpad::Driver::drv) + + +/****************************** struct Touchpad *******************************/ +#undef None + +struct Touchpad +{ + enum Driver { None, LibInput, Synaptics }; + + bool valid = false; + unsigned int id; + TQCString name; + Driver driver = Touchpad::Driver::None; + + void init(unsigned int _id, TQCString _name) + { + valid = true; + id = _id; + name = _name; + } +}; + + +/***************************** TouchpadSettings *******************************/ +class TouchpadSettings +{ + public: + TouchpadSettings(); + + void load(bool defaults = false); + void save(); + void apply(bool force = false); + + TQValueList<bool> getScrollMethodsAvailability(); + TQValueList<bool> getAccelProfilesAvailability(); + + bool enabled, tapClick, tapDrag, tapDragLock, tapMapping, offWhileTyping, + leftHandedMode, midButtonEmulation, naturalScroll, scrollMethod; + int scrollDirections, naturalScrollDirections; + + int accelSpeed, accelProfile; + + bool foundTouchpad(); + Touchpad touchpad(); + + // Enable/disable touchpad without applying all settings + bool setTouchpadEnabled(bool on); + + bool supportedTouchpad(); + + protected: + bool findTouchpad(); + + private: + Touchpad m_touchpad; + bool m_foundTouchpad; +}; + +#endif // __TOUCHPAD_SETTINGS_H__
\ No newline at end of file diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index c4c73396a..32e036f8c 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -22,9 +22,9 @@ #include <tdelocale.h> #include <tdeaboutdata.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> #include <kdialog.h> #include <tdemessagebox.h> @@ -100,8 +100,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectionChanged(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectionChanged(TQListViewItem*)) ); themeDirs = getThemeBaseDirs(); insertThemes(); @@ -111,8 +111,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) installButton = new TQPushButton( i18n("Install New Theme..."), hbox ); removeButton = new TQPushButton( i18n("Remove Theme"), hbox ); - connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) ); + connect( installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( installClicked() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeClicked() ) ); // Disable the install button if ~/.icons isn't writable TQString path = TQDir::homeDirPath() + "/.icons"; @@ -343,7 +343,7 @@ void ThemePage::insertTheme( const TQString &path ) TQString desc = defaultThemeDescription( name ); TQString sample = "left_ptr"; - KSimpleConfig c( path + "/index.theme", true ); // Open read-only + TDESimpleConfig c( path + "/index.theme", true ); // Open read-only c.setGroup( "Icon Theme" ); // Don't insert the theme if it's hidden. @@ -429,7 +429,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const // Parse the index.theme file if one exists if ( haveIndexFile ) { - KSimpleConfig c( indexfile, true ); // Open read-only + TDESimpleConfig c( indexfile, true ); // Open read-only c.setGroup( "Icon Theme" ); inherit = c.readListEntry( "Inherits" ); } @@ -493,7 +493,7 @@ void ThemePage::insertThemes() // Parse the index.theme file if the theme has one. if ( haveIndexFile ) { - KSimpleConfig c( indexfile, true ); + TDESimpleConfig c( indexfile, true ); c.setGroup( "Icon Theme" ); // Skip this theme if it's hidden. @@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) // Calculate the image size int size = kMax( iconSize, kMax( r.width(), r.height() ) ); - // Create the intermediate QImage + // Create the intermediate TQImage TQImage image( size, size, 32 ); image.setAlphaBuffer( true ); @@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) // Scale down the image if we need to if ( image.width() > iconSize || image.height() > iconSize ) - image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin ); + image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin ); pix.convertFromImage( image ); XcursorImageDestroy( xcur ); diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h index 548ed0063..bc284aa48 100644 --- a/kcontrol/input/xcursor/themepage.h +++ b/kcontrol/input/xcursor/themepage.h @@ -34,7 +34,7 @@ struct ThemeInfo; class ThemePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ThemePage( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/input/xiproperty.h b/kcontrol/input/xiproperty.h new file mode 100644 index 000000000..ddbdf4b16 --- /dev/null +++ b/kcontrol/input/xiproperty.h @@ -0,0 +1,123 @@ +/******************************************************************************* + XIGetProperty/XIChangeProperty wrapper + + Copyright © 2013 Alexandr Mezin <mezin.alexander@gmail.com> + Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <https://www.gnu.org/licenses/>. + +*******************************************************************************/ + +#ifndef __XI_PROPERTY_H__ +#define __XI_PROPERTY_H__ + +// TQt +#include <tqobject.h> // tqt_xdisplay() +#include <tqvariant.h> + +// X11 +#include <X11/Xatom.h> + + +class XIProperty +{ + public: + XIProperty() + : device(-1), + type(0), + format(0), + num_items(0), + data(0), + b(nullptr), + i(nullptr), + f(nullptr) + {} + + XIProperty(int device, TQCString propertyName) + : device(device), + type(0), + format(0), + num_items(0), + data(0), + b(nullptr), + i(nullptr), + f(nullptr) + { + Display *disp = tqt_xdisplay(); + + property = XInternAtom(disp, propertyName, true); + + unsigned char *ptr = nullptr; + unsigned long bytes_after; + + XIGetProperty(disp, device, property, 0, 1000, False, AnyPropertyType, + &type, &format, &num_items, &bytes_after, &ptr); + + data = ptr; + + if (format == CHAR_BIT && type == XA_INTEGER) + { + b = reinterpret_cast<char *>(data); + } + + if (format == sizeof(int) * CHAR_BIT + && (type == XA_INTEGER || type == XA_CARDINAL)) + { + i = reinterpret_cast<int *>(data); + } + + Atom floatType = XInternAtom(disp, "FLOAT", true); + + if (format == sizeof(float) * CHAR_BIT && floatType && type == floatType) + { + f = reinterpret_cast<float *>(data); + } + } + + ~XIProperty() + { + XFree(data); + } + + TQVariant operator[](int offset) + { + if (offset >= num_items) return TQVariant(); + + if (b) return TQVariant(static_cast<int>(b[offset])); + if (i) return TQVariant(i[offset]); + if (f) return TQVariant(f[offset]); + + return TQVariant(); + } + + void set() + { + XIChangeProperty(tqt_xdisplay(), device, property, type, format, XIPropModeReplace, + data, num_items); + } + + int count() { return num_items; } + + public: + char *b; + int *i; + float *f; + + private: + Atom property, type; + int device, format; + unsigned long num_items; + unsigned char *data; +}; + +#endif // __XI_PROPERTY_H__
\ No newline at end of file diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h index 202296f2b..519e98526 100644 --- a/kcontrol/joystick/caldialog.h +++ b/kcontrol/joystick/caldialog.h @@ -31,7 +31,7 @@ class JoyDevice; class CalDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CalDialog(TQWidget *parent, JoyDevice *joy); diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index d0521d81e..1db8f974b 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick")) extern "C" { - KDE_EXPORT bool test_joystick() + TDE_EXPORT bool test_kcm_joystick() { /* Code stolen from JoyWidget::init() */ int i; char dev[30]; diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h index 8ef9e966e..233656537 100644 --- a/kcontrol/joystick/joystick.h +++ b/kcontrol/joystick/joystick.h @@ -27,7 +27,7 @@ class JoyWidget; class joystick: public TDECModule { - Q_OBJECT + TQ_OBJECT public: joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList()); diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index 5d104006b..c88f6d217 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -65,7 +65,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) new TQLabel(i18n("Device:"), devHbox); device = new TQComboBox(true, devHbox); device->setInsertionPolicy(TQComboBox::NoInsertion); - connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &))); + connect(device, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(deviceChanged(const TQString &))); devHbox->setStretchFactor(device, 3); TQHBox *hbox = new TQHBox(mainVbox); @@ -77,7 +77,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) new TQLabel(i18n("Position:"), vboxLeft); xyPos = new PosWidget(vboxLeft); trace = new TQCheckBox(i18n("Show trace"), mainVbox); - connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool))); + connect(trace, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(traceChanged(bool))); TQVBox *vboxMid = new TQVBox(hbox); vboxMid->setSpacing(KDialog::spacingHint()); @@ -111,12 +111,12 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) // calibrate button calibrate = new TQPushButton(i18n("Calibrate"), mainVbox); - connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice())); + connect(calibrate, TQ_SIGNAL(clicked()), this, TQ_SLOT(calibrateDevice())); calibrate->setEnabled(false); // set up a timer for idle processing of joystick events idle = new TQTimer(this); - connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice())); + connect(idle, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkDevice())); // check which devicefiles we have init(); diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h index 45291d275..057a8bd9e 100644 --- a/kcontrol/joystick/joywidget.h +++ b/kcontrol/joystick/joywidget.h @@ -37,7 +37,7 @@ class TQHBox; // the widget which displays all buttons, values, etc. class JoyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: JoyWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp index af8609070..5eb249f58 100644 --- a/kcontrol/joystick/poswidget.cpp +++ b/kcontrol/joystick/poswidget.cpp @@ -32,7 +32,7 @@ PosWidget::PosWidget(TQWidget *parent, const char *name) { setMinimumSize(XY_WIDTH, XY_WIDTH); setMaximumSize(XY_WIDTH, XY_WIDTH); - setPaletteBackgroundColor(Qt::white); + setPaletteBackgroundColor(TQt::white); } //----------------------------------------------------------------- @@ -42,7 +42,7 @@ void PosWidget::paintEvent(TQPaintEvent *) TQPainter paint(this); paint.drawRect(0, 0, width(), height()); - paint.setPen(Qt::gray); + paint.setPen(TQt::gray); // draw a center grid paint.drawLine(XY_WIDTH/2, 1, @@ -52,7 +52,7 @@ void PosWidget::paintEvent(TQPaintEvent *) XY_WIDTH - 2, XY_WIDTH/2); // draw the current position marker - paint.setPen(Qt::blue); + paint.setPen(TQt::blue); paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2, x + MARK_WIDTH/2, y + MARK_WIDTH/2); @@ -111,7 +111,7 @@ void PosWidget::eraseOld() //paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1); // erase previous cross (don't use eraseRect() so that trace flags will be not destroyed so much) - paint.setPen(Qt::white); + paint.setPen(TQt::white); paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2, x + MARK_WIDTH/2, y + MARK_WIDTH/2); @@ -121,7 +121,7 @@ void PosWidget::eraseOld() if ( trace ) // show previous position with a smaller black cross { - paint.setPen(Qt::black); + paint.setPen(TQt::black); paint.drawLine(x - 2, y - 2, x + 2, y + 2); diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h index 324ee1da2..3ee85a912 100644 --- a/kcontrol/joystick/poswidget.h +++ b/kcontrol/joystick/poswidget.h @@ -28,7 +28,7 @@ */ class PosWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PosWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index c1ba4fecf..cd3859124 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kpixmap.h> @@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca _viewer = new TDEHTMLPart( this, "_viewer" ); _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) ); updatePixmap(); } @@ -112,7 +112,7 @@ void AboutWidget::updatePixmap() TQString res = t.read(); res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.arg( "" ); diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index 97ba32ffd..5d4543b39 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -33,7 +33,7 @@ class KURL; class AboutWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index dd1835e9d..f59b95624 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -95,7 +95,7 @@ void ModuleTitle::clear() { m_icon->setPixmap( TQPixmap() ); m_name->setText( TQString::null ); - kapp->processEvents(); + tdeApp->processEvents(); } ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) @@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) m_title = new ModuleTitle( titleLine, "m_title" ); TQPushButton *helpButton = new TQPushButton( titleLine ); helpButton->setIconSet( SmallIconSet("help") ); - connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) ); + connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) ); m_body = new TQVBox( this, "m_body" ); setStretchFactor( m_body, 10 ); } @@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent) addWidget( _busyw ); _modulew = new ModuleWidget( this, "_modulew" ); - connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) ); + connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) ); addWidget( _modulew ); } @@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(TQWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); ProxyWidget *widget = _modulew->load( module ); if (widget) { _module = module; - connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule())); - connect(_module, TQT_SIGNAL(changed(ConfigModule *)), - TQT_SIGNAL(changedModule(ConfigModule *))); - connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged())); + connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule())); + connect(_module, TQ_SIGNAL(changed(ConfigModule *)), + TQ_SIGNAL(changedModule(ConfigModule *))); + connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged())); raiseWidget( _modulew ); emit newModule(widget->caption(), module->docPath(), widget->quickHelp()); @@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n" } raiseWidget( _busyw ); - kapp->processEvents(); + tdeApp->processEvents(); deleteModule(); if (!module) return true; diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h index ea62495bd..7246691e6 100644 --- a/kcontrol/kcontrol/dockcontainer.h +++ b/kcontrol/kcontrol/dockcontainer.h @@ -30,7 +30,7 @@ class TQLabel; class ModuleWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ModuleWidget( TQWidget *parent, const char *name ); @@ -48,7 +48,7 @@ class ModuleWidget : public TQVBox class DockContainer : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: DockContainer(TQWidget *parent=0); diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index ca80619e5..c78de0071 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -43,6 +43,7 @@ TQString KCGlobal::_iversion = ""; TQString KCGlobal::_imachine = ""; IndexViewMode KCGlobal::_viewmode = Icon; TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium; +bool KCGlobal::_showhidden = false; TQString KCGlobal::_baseGroup = ""; void KCGlobal::init() @@ -105,7 +106,7 @@ TQString KCGlobal::baseGroup() void KCGlobal::repairAccels( TQWidget * tw ) { - TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING ); + TQObjectList * l = tw->queryList( "TQAccel" ); TQObjectListIt it( *l ); // iterate over the buttons TQObject * obj; while ( (obj=it.current()) != 0 ) { // for each found object... diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h index 0fbc1d9b7..a0b44c0b7 100644 --- a/kcontrol/kcontrol/global.h +++ b/kcontrol/kcontrol/global.h @@ -46,6 +46,7 @@ public: static TQString systemMachine() { return _imachine; } static IndexViewMode viewMode() { return _viewmode; } static TDEIcon::StdSizes iconSize() { return _iconsize; } + static bool showHiddenModules() { return _showhidden; } static TQString baseGroup(); static void setIsInfoCenter(bool b) { _infocenter = b; } @@ -60,6 +61,7 @@ public: static void setSystemMachine(const TQString& n){ _imachine = n; } static void setViewMode(IndexViewMode m) { _viewmode = m; } static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; } + static void setShowHiddenModules(bool o) { _showhidden = o; } static void repairAccels( TQWidget * tw ); @@ -71,6 +73,7 @@ private: static IndexViewMode _viewmode; static TDEIcon::StdSizes _iconsize; static TQString _baseGroup; + static bool _showhidden; }; #endif diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index f21c03c71..af20e8870 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -21,7 +21,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <krun.h> @@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url) } if ( textUrl.find('@') > -1 ) { - kapp->invokeMailer(textUrl); + tdeApp->invokeMailer(textUrl); return true; } diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index 92b9cf0a0..ed8e8ca03 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -42,6 +42,8 @@ void IndexWidget::reload() { if (_icon) _icon->fill(); + if (_tree) + _tree->fill(); } TQListViewItem *IndexWidget::firstTreeViewItem() @@ -60,7 +62,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e) void IndexWidget::moduleSelected(ConfigModule *m) { - const TQObject *obj = TQT_TQOBJECT_CONST(sender()); + const TQObject *obj = sender(); if(!m) return; emit moduleActivated(m); @@ -69,19 +71,19 @@ void IndexWidget::moduleSelected(ConfigModule *m) { _tree->makeVisible(m); - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(m); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } else if (obj->inherits("ModuleTreeView") && _icon) { _icon->makeVisible(m); - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(m); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -89,17 +91,17 @@ void IndexWidget::makeSelected(ConfigModule *module) { if (_icon) { - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(module); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } if (_tree) { - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(module); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -121,8 +123,8 @@ void IndexWidget::activateView(IndexViewMode mode) { _icon=new ModuleIconView(_modules, this); _icon->fill(); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } raiseWidget( _icon ); } @@ -132,10 +134,10 @@ void IndexWidget::activateView(IndexViewMode mode) { _tree=new ModuleTreeView(_modules, this); _tree->fill(); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); - connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SIGNAL(categorySelected(TQListViewItem*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SIGNAL(categorySelected(TQListViewItem*))); } raiseWidget( _tree ); } diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h index 6471e0ec3..a373aafce 100644 --- a/kcontrol/kcontrol/indexwidget.h +++ b/kcontrol/kcontrol/indexwidget.h @@ -31,7 +31,7 @@ class ModuleIconView; class IndexWidget : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/kcontrolui.rc b/kcontrol/kcontrol/kcontrolui.rc index 92867beb3..c9e4c48aa 100644 --- a/kcontrol/kcontrol/kcontrolui.rc +++ b/kcontrol/kcontrol/kcontrolui.rc @@ -12,6 +12,8 @@ <Action name="activate_largeicons"/> <Action name="activate_hugeicons"/> </Menu> + <Separator/> + <Action name="show_hidden_modules"/> </Menu> <Menu name="help"> <Action name="help_about_module" append="about_merge"/> diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 25ab4fc4a..ec824396b 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -50,7 +50,7 @@ #include "version.h" KControlApp::KControlApp() - : KUniqueApplication() + : TDEUniqueApplication() , toplevel(0) { toplevel = new TopLevel(); @@ -58,11 +58,11 @@ KControlApp::KControlApp() setMainWidget(toplevel); TDEGlobal::setActiveInstance(this); - // KUniqueApplication does dcop regitration for us - ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); + // TDEUniqueApplication does dcop regitration for us + ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); - connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); - connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); + connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest())); + connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest())); TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); TDEConfig *config = TDEGlobal::config(); @@ -90,7 +90,7 @@ KControlApp::~KControlApp() { TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); - TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desk = TQApplication::desktop(); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); @@ -98,12 +98,12 @@ KControlApp::~KControlApp() delete toplevel; } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kcontrol"); TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, - I18N_NOOP("(c) 1998-2004, The Trinity Control Center Developers")); + I18N_NOOP("(c) 1998-2024, The Trinity Control Center Developers")); TQCString argv_0 = argv[0]; TDEAboutData *aboutData; @@ -121,7 +121,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); KCGlobal::init(); diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h index 783e10001..e39a7f7cc 100644 --- a/kcontrol/kcontrol/main.h +++ b/kcontrol/kcontrol/main.h @@ -21,13 +21,13 @@ #ifndef __main_h__ #define __main_h__ -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class TopLevel; -class KControlApp : public KUniqueApplication +class KControlApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KControlApp(); diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index dbaba9054..5cc43c82d 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -26,7 +26,7 @@ ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { - _parent = TQT_TQWIDGET(parent); + _parent = static_cast<TQWidget*>(parent); } diff --git a/kcontrol/kcontrol/moduleIface.h b/kcontrol/kcontrol/moduleIface.h index 17b4b07ad..00f2d0d39 100644 --- a/kcontrol/kcontrol/moduleIface.h +++ b/kcontrol/kcontrol/moduleIface.h @@ -28,7 +28,7 @@ class ModuleIface : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 45be8a1ac..13b1aa366 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -22,9 +22,10 @@ #include <tqcursor.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> +#include <tdecmoduleloader.h> #include <kdebug.h> @@ -51,8 +52,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const // This is intentionally _not_ connected with executed(), since // honoring doubleclick doesn't make any sense here (changed by // large user demand) - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleIconView::makeSelected(ConfigModule *m) @@ -168,3 +169,14 @@ TQPixmap ModuleIconView::loadIcon( const TQString &name ) return icon; } + +ModuleIconItem::ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m) + : TDEListViewItem(parent, text) + , _tag(TQString::null) + , _module(m) +{ + setPixmap(0, pm); + + if (!_module) return; + setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module)); +}
\ No newline at end of file diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index 12cb14d73..ff76ebce2 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -29,13 +29,7 @@ class ModuleIconItem : public TDEListViewItem { public: - ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0) - : TDEListViewItem(parent, text) - , _tag(TQString::null) - , _module(m) - { - setPixmap(0, pm); - } + ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0); void setConfigModule(ConfigModule* m) { _module = m; } void setTag(const TQString& t) { _tag = t; } @@ -56,7 +50,7 @@ private: class ModuleIconView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index f203e6b57..1c1a874ce 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -29,7 +29,7 @@ that is intentional :-] #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kservicegroup.h> #include <kdebug.h> @@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n fill(this, KCGlobal::baseGroup()); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); } void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) @@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) // create new menu TDEPopupMenu *menu = new TDEPopupMenu(parentMenu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index 9ce39b584..890a2d857 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/kcontrol/kcontrol/modulemenu.h @@ -40,7 +40,7 @@ class ConfigModuleList; class ModuleMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index e40d62568..c6d9f73ee 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -27,10 +27,10 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kservicegroup.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <qxembed.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "modules.h" @@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module() { _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root); - connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); - connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed())); - connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest())); - connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest())); - connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot())); + connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); + connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed())); + connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest())); + connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest())); + connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot())); return _module; } @@ -101,7 +101,7 @@ void ConfigModule::deleteClient() _embedStack = 0; delete _embedFrame; _embedFrame = 0; - kapp->syncX(); + tdeApp->syncX(); if(_module) _module->close(true); @@ -157,7 +157,7 @@ void ConfigModule::runAsRoot() _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); _embedStack->raiseWidget(_busy); - connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); + connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded())); // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*))); if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { @@ -282,9 +282,9 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path) if (p->isType(KST_KService)) { KService *s = static_cast<KService*>(p); - if (!kapp->authorizeControlModule(s->menuId())) + if (!tdeApp->authorizeControlModule(s->menuId())) continue; - + ConfigModule *module = new ConfigModule(s); if (module->library().isEmpty()) { diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index 63ddee668..16751831e 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -38,7 +38,7 @@ class TQWidgetStack; class ConfigModule : public TQObject, public TDECModuleInfo { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ protected: class KControlEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KControlEmbed( TQWidget* w ) : QXEmbed( w ) {} virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); } diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index fd0bda8aa..15f5cb9eb 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -26,6 +26,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <kservicegroup.h> +#include <tdecmoduleloader.h> #include <kdebug.h> #include <tqwhatsthis.h> #include <tqbitmap.h> @@ -85,12 +86,20 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const new ModuleTreeWhatsThis( this ); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleTreeView::fill() { + // If we have a currently selected module, preserve selection + ConfigModule *currentModule = nullptr; + if (currentItem()) + { + currentModule = static_cast<ModuleTreeItem*>(currentItem())->module(); + } + + // (Re)fill the tree view clear(); TQStringList subMenus = _modules->submenus(KCGlobal::baseGroup()); @@ -107,7 +116,14 @@ void ModuleTreeView::fill() TQPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup()); for (module=moduleList.first(); module != 0; module=moduleList.next()) { - new ModuleTreeItem(this, module); + new ModuleTreeItem(this, module); + } + + // Restore selection + if (currentModule) + { + makeSelected(currentModule); + makeVisible(currentModule); } } @@ -131,8 +147,6 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) } } - - TQSize ModuleTreeView::sizeHint() const { return TQListView::sizeHint().boundedTo( @@ -272,12 +286,7 @@ ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, ConfigModule *module) , _tag(TQString::null) , _maxChildIconWidth(0) { - if (_module) - { - setText(0, " " + module->moduleName()); - _icon = module->icon(); - setPixmap(0, appIcon(_icon)); - } + init(); } ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module) @@ -286,12 +295,7 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module) , _tag(TQString::null) , _maxChildIconWidth(0) { - if (_module) - { - setText(0, " " + module->moduleName()); - _icon = module->icon(); - setPixmap(0, appIcon(_icon)); - } + init(); } ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, const TQString& text) @@ -308,6 +312,18 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, const TQString& text) , _maxChildIconWidth(0) {} +void ModuleTreeItem::init() +{ + if (!_module) return; + + setText(0, " " + _module->moduleName()); + _icon = _module->icon(); + setPixmap(0, appIcon(_icon)); + + + setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module)); +} + void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm) { if (!pm.isNull()) @@ -340,7 +356,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu if (offset > 0) { TQPixmap pixmap(offset, offset); - pixmap.fill(Qt::color0); + pixmap.fill(TQt::color0); pixmap.setMask(pixmap.createHeuristicMask()); TQBitmap mask( pixmap.size(), true ); pixmap.setMask( mask ); diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index 271214c98..bf0a12f72 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -57,6 +57,9 @@ protected: void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); private: + void init(); + +private: ConfigModule *_module; TQString _tag; TQString _caption; @@ -66,7 +69,7 @@ private: class ModuleTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 893c75d7a..159f93a01 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), replyType, replyData)) if ( replyType == "TQPalette") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setPalette(pal); } /* // Doesn't work ... - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), replyType, replyData)) if ( replyType == "TQString") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setStyle(style); } */ - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), replyType, replyData)) if ( replyType == "TQFont") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, view = new ProxyView(client, title, this, run_as_root, "proxyview"); (void) new WhatsThis( this ); - connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool))); - connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged())); + connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool))); + connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged())); _sep = new KSeparator(KSeparator::HLine, this); @@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, _apply->setEnabled( false ); _reset->setEnabled( false ); - connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked())); - connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked())); - connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked())); - connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked())); - connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked())); + connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked())); + connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked())); + connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked())); + connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked())); + connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked())); TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, ProxyWidget::~ProxyWidget() { -#ifdef USE_QT4 - #warning Possible memory leak in ProxyWidget::~ProxyWidget() -#else // USE_QT4 if (_client) delete _client; _client = 0; -#endif // USE_QT4 } TQString ProxyWidget::quickHelp() const @@ -277,7 +273,7 @@ void ProxyWidget::handbookClicked() if (getuid()!=0) emit handbookRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); } void ProxyWidget::helpClicked() @@ -285,7 +281,7 @@ void ProxyWidget::helpClicked() if (getuid()!=0) emit helpRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); } void ProxyWidget::defaultClicked() diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index 804803c51..95d8a597d 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -38,7 +38,7 @@ class ProxyView; class ProxyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 995d162e3..663a8744c 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -20,7 +20,6 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <tqsortedlist.h> #include <tqregexp.h> #include <klineedit.h> @@ -88,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name) l->addWidget(_resultList); - connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT(slotKeywordSelected(const TQString&))); + connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT(slotKeywordSelected(const TQString&))); - connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)), - this, TQT_SLOT(slotModuleSelected(TQListBoxItem *))); - connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)), - this, TQT_SLOT(slotModuleClicked(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(slotModuleSelected(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)), + this, TQ_SLOT(slotModuleClicked(TQListBoxItem *))); } void SearchWidget::populateKeywordList(ConfigModuleList *list) diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index 2e6306bbc..d0f850218 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -50,7 +50,7 @@ class KeywordListEntry class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchWidget(TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 519ec91df..12c9a37b8 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -19,12 +19,12 @@ */ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kbugreport.h> #include <tdeaboutapplication.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <twin.h> #include <kiconloader.h> @@ -81,12 +81,12 @@ TopLevel::TopLevel(const char* name) _modules->readDesktopEntries(); for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) { - connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) ); - connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); + connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) ); + connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) ); } // create the layout box - _splitter = new TQSplitter( Qt::Horizontal, this ); + _splitter = new TQSplitter( TQt::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame ); @@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name) KLineEdit *searchEdit = new KLineEdit( mSearchFrame ); clearButton->setFixedHeight( searchEdit->height() ); - connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) ); label->setBuddy( searchEdit ); searchLayout->addWidget( searchEdit ); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotSearchChanged(const TQString &) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotSearchChanged(const TQString &) ) ); // create the left hand side under search _stack = new TQWidgetStack( leftFrame ); @@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name) // index tab _index = new IndexWidget(_modules, this); - connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)), - this, TQT_SLOT(activateModule(ConfigModule*))); + connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)), + this, TQ_SLOT(activateModule(ConfigModule*))); _stack->addWidget( _index ); - connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SLOT(categorySelected(TQListViewItem*))); + connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SLOT(categorySelected(TQListViewItem*))); // search tab _search = new SearchWidget(this); _search->populateKeywordList(_modules); - connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)), - this, TQT_SLOT(activateModule(ConfigModule *))); + connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)), + this, TQ_SLOT(activateModule(ConfigModule *))); _stack->addWidget( _search ); @@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name) // That one does the trick ... _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize ); - connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&))); - connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)), - TQT_SLOT(changedModule(ConfigModule*))); + connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&))); + connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)), + TQ_SLOT(changedModule(ConfigModule*))); // set the main view setCentralWidget( _splitter ); @@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name) if (KCGlobal::isInfoCenter()) { AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem()); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ), @@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name) else { AboutWidget *aw = new AboutWidget(this); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget(aw); } } @@ -234,40 +234,44 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); icon_view = new TDERadioAction - (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQ_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new TDERadioAction - (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()), + (i18n("&Tree View"), 0, this, TQ_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new TDERadioAction - (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()), + (i18n("&Small"), 0, this, TQ_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new TDERadioAction - (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, this, TQ_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new TDERadioAction - (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()), + (i18n("&Large"), 0, this, TQ_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new TDERadioAction - (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, this, TQ_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + show_hidden_modules = new TDEToggleAction + (i18n("Show hidden modules"), 0, this, TQ_SLOT(toggleHiddenModules()), + actionCollection(), "show_hidden_modules"); + + about_module = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); createGUI("kcontrolui.rc"); @@ -275,7 +279,7 @@ actionCollection()); report_bug = actionCollection()->action("help_report_bug"); report_bug->setText(i18n("&Report Bug...")); report_bug->disconnect(); - connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug())); + connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug())); } void TopLevel::activateIconView() @@ -340,6 +344,12 @@ void TopLevel::activateHugeIcons() _index->reload(); } +void TopLevel::toggleHiddenModules() +{ + KCGlobal::setShowHiddenModules(show_hidden_modules->isChecked()); + _index->reload(); +} + void TopLevel::newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp) { setCaption(name, false); @@ -399,8 +409,8 @@ void TopLevel::categorySelected(TQListViewItem *category) else { AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption ); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); } } @@ -495,7 +505,7 @@ void TopLevel::reportBug() } KBugReport *br = new KBugReport(this, false, dummyAbout); if (deleteit) - connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout())); + connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout())); else dummyAbout = 0; br->show(); diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 39aa25090..0abf4e0e5 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -41,7 +41,7 @@ class ModuleTitle; class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: TopLevel( const char* name=0 ); @@ -64,6 +64,7 @@ protected slots: void activateMediumIcons(); void activateLargeIcons(); void activateHugeIcons(); + void toggleHiddenModules(); void deleteDummyAbout(); @@ -86,6 +87,7 @@ private: TDEToggleAction *tree_view, *icon_view; TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge; + TDEToggleAction *show_hidden_modules; TDEAction *report_bug, *about_module; IndexWidget *_index; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index f6fcd2e5a..a6bec1ca8 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -31,13 +31,13 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <kgenericfactory.h> #include <tdelistview.h> #include <tdemessagebox.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kcmkded.h" #include "kcmkded.moc" @@ -96,16 +96,16 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvStartup->setAllColumnsShowFocus(true); _lvStartup->header()->setStretchEnabled(true, 2); - KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal); + KButtonBox *buttonBox = new KButtonBox( gb, TQt::Horizontal); _pbStart = buttonBox->addButton( i18n("Start")); _pbStop = buttonBox->addButton( i18n("Stop")); _pbStart->setEnabled( false ); _pbStop->setEnabled( false ); - connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService())); - connect(_pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService())); - connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) ); + connect(_pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartService())); + connect(_pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(slotStopService())); + connect(_lvStartup, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotEvalItem(TQListViewItem*)) ); load(); } @@ -156,12 +156,12 @@ void KDEDConfig::load( bool useDefaults ) { CheckListItem* clitem; for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - if ( KDesktopFile::isDesktopFile( *it ) ) { - KDesktopFile file( *it, true, "services" ); + if ( TDEDesktopFile::isDesktopFile( *it ) ) { + TDEDesktopFile file( *it, true, "services" ); if ( file.readBoolEntry("X-TDE-Kded-autoload") ) { clitem = new CheckListItem(_lvStartup, TQString::null); - connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*))); + connect(clitem, TQ_SIGNAL(changed(TQCheckListItem*)), TQ_SLOT(slotItemChecked(TQCheckListItem*))); clitem->setOn(autoloadEnabled(&kdedrc, *it)); item = clitem; item->setText(1, file.readName()); @@ -194,7 +194,7 @@ void KDEDConfig::save() { for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - if ( KDesktopFile::isDesktopFile( *it ) ) { + if ( TDEDesktopFile::isDesktopFile( *it ) ) { TDEConfig file( *it, false, false, "services" ); file.setGroup("Desktop Entry"); @@ -212,7 +212,7 @@ void KDEDConfig::save() { kdedrc.sync(); DCOPRef( "kded", "kded" ).call( "reconfigure" ); - TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled())); + TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled())); } @@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus() TQByteArray replyData; - if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), + if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData ) ) { _lvLoD->setEnabled( false ); @@ -310,7 +310,7 @@ void KDEDConfig::slotStartService() TQCString replyType; TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { + if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { TQDataStream reply(replyData, IO_ReadOnly); if ( replyType == "bool" ) { @@ -337,7 +337,7 @@ void KDEDConfig::slotStopService() TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { + if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { slotServiceRunningToggled(); } else { diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 6dff072ea..eaffa3808 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -30,7 +30,7 @@ class TQPushButton; class KDEDConfig : public TDECModule { -Q_OBJECT +TQ_OBJECT public: KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList()); ~KDEDConfig() {}; @@ -64,7 +64,7 @@ private: class CheckListItem : public TQObject, public TQCheckListItem { - Q_OBJECT + TQ_OBJECT public: CheckListItem(TQListView* parent, const TQString &text); ~CheckListItem() { } diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 4ae379a50..31e1b0500 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI() "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>")); label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); - disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); - connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); + disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &))); + connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); @@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI() "currently defined on this system. Click to select a command to " "assign a keyboard shortcut to. Complete management of these " "entries can be done via the menu editor program.")); - connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)), - this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool))); - connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int))); + connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)), + this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool))); + connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int))); m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this); mainLayout->addWidget(m_shortcutBox); TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2); @@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI() "to the currently selected command.")); buttonLayout->addSpacing(KDialog::spacingHint() * 2); buttonLayout->addWidget(m_shortcutButton); - connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), - this, TQT_SLOT(shortcutChanged(const TDEShortcut&))); - connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool))); - connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool))); + connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQ_SLOT(shortcutChanged(const TDEShortcut&))); + connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool))); + connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool))); buttonLayout->addStretch(1); } diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index 54be5345b..9cb328f15 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -37,7 +37,7 @@ typedef TQPtrListIterator<AppTreeItem> treeItemListIterator; class CommandShortcutsModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~CommandShortcutsModule(); diff --git a/kcontrol/keys/kde4.kksrc b/kcontrol/keys/kde4.kksrc index 367bc41d6..a35eaafbd 100644 --- a/kcontrol/keys/kde4.kksrc +++ b/kcontrol/keys/kde4.kksrc @@ -75,8 +75,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Win+Ctrl+Delete Lock Session=Win+ScrollLock -Logout=Win+Escape -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Win+Escape +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Win+Ctrl+R Mouse Emulation=none Popup Launch Menu=Win+Menu @@ -85,6 +86,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=Win+Ctrl+V Show Taskmanager=Win+Ctrl+Pause Show Window List=Win+0 +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index ee39447a1..1cf193fde 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include <kseparator.h> #include <dcopclient.h> @@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) //readSchemeNames(); sList->setCurrentItem( 0 ); - connect( sList, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotPreviewScheme( int ) ) ); TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this ); @@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) TQWhatsThis::add( sList, wtstr ); addBt = new TQPushButton( i18n("&Save Scheme..."), this ); - connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); + connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); removeBt = new TQPushButton( i18n("&Remove Scheme"), this ); - removeBt->setEnabled(FALSE); - connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); + removeBt->setEnabled(false); + connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") ); @@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) if( !KKeySequence::keyboardHasMetaKey() ) preferMetaBt->setEnabled( false ); preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() ); - connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) ); + connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) ); TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would " "like TDE to prefer the 3-modifier configuration defaults, then this option " "should be unchecked.") ); @@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) KSeparator* line = new KSeparator( KSeparator::HLine, this ); kc = new KeyChooserSpec( actions, this, isGlobal ); - connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) ); + connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) ); readScheme(); @@ -206,12 +206,12 @@ void KKeyModule::load() kc->commitChanges(); actions.writeActions( KeySet, 0, true, true ); if ( KeyType == "global" ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); // TODO: create a reconfigureKeys() method. - kapp->dcopClient()->send("twin", "", "reconfigure()", ""); - kapp->dcopClient()->send("kdesktop", "", "configure()", ""); - kapp->dcopClient()->send("kicker", "Panel", "configure()", ""); + tdeApp->dcopClient()->send("twin", "", "reconfigure()", ""); + tdeApp->dcopClient()->send("kdesktop", "", "configure()", ""); + tdeApp->dcopClient()->send("kicker", "Panel", "configure()", ""); } }*/ @@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange() /*void KKeyModule::slotSave( ) { - KSimpleConfig config(*sFileList->at( sList->currentItem() ) ); + TDESimpleConfig config(*sFileList->at( sList->currentItem() ) ); // global=true is necessary in order to // let both 'Global Shortcuts' and 'Shortcut Sequences' be // written to the same scheme file. @@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index ) else { TDEConfigBase* config = 0; if( index == 0 ) config = new TDEConfig( "kdeglobals" ); - //else config = new KSimpleConfig( *sFileList->at( index ), true ); + //else config = new TDESimpleConfig( *sFileList->at( index ), true ); actions.readActions( (index == 0) ? KeySet : KeyScheme, config ); kc->listSync(); @@ -303,7 +303,7 @@ void KKeyModule::readScheme( int index ) do { - nameValid = TRUE; + nameValid = true; if ( ss.exec() ) { sName = ss.nameLine->text(); @@ -354,10 +354,10 @@ void KKeyModule::readScheme( int index ) } } else return; - } while ( nameValid == FALSE ); + } while ( nameValid == false ); - disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotPreviewScheme( int ) ) ); + disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotPreviewScheme( int ) ) ); TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/"); @@ -394,8 +394,8 @@ void KKeyModule::readScheme( int index ) sList->setCurrentItem( exists ); } - KSimpleConfig *config = - new KSimpleConfig( sFile ); + TDESimpleConfig *config = + new TDESimpleConfig( sFile ); config->setGroup( KeyScheme ); config->writeEntry( "Name", sName ); @@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index ) slotSave(); - connect( sList, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotPreviewScheme( int ) ) ); slotPreviewScheme( sList->currentItem() ); }*/ @@ -418,9 +418,9 @@ void KKeyModule::readScheme( int index ) if ( indx < nSysSchemes || (*sFileList->at(indx)).contains( "/global-" ) || (*sFileList->at(indx)).contains( "/app-" ) ) { - removeBt->setEnabled( FALSE ); + removeBt->setEnabled( false ); } else { - removeBt->setEnabled( TRUE ); + removeBt->setEnabled( true ); } }*/ @@ -449,7 +449,7 @@ void KKeyModule::readScheme( int index ) //if( r.search( *it ) != -1 ) // continue; - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); // TODO: Put 'Name' in "Settings" group config.setGroup( KeyScheme ); TQString str = config.readEntry( "Name" ); @@ -496,7 +496,7 @@ void KKeyModule::init() keys->readActions( "Global Keys" ); { - KSimpleConfig cfg( "kdeglobals" ); + TDESimpleConfig cfg( "kdeglobals" ); cfg.deleteGroup( "Global Keys" ); } diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index f442a2c31..4da3f16b2 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -22,7 +22,7 @@ class KeyChooserSpec; class KKeyModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDEAccelActions actions; //TDEAccelActions dict; @@ -77,7 +77,7 @@ protected: class KeyChooserSpec : public KKeyChooser { - Q_OBJECT + TQ_OBJECT public: KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal ); diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index d002b667f..b54ffb5cd 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -25,7 +25,8 @@ #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> +#include <dcopref.h> #include "commandShortcuts.h" #include "main.h" @@ -75,16 +76,16 @@ void KeyModule::initGUI() m_pShortcuts = new ShortcutsModule( this ); m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") ); - connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); m_pCommandShortcuts = new CommandShortcutsModule ( this ); m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") ); - connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); - connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) ); + connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); + connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) ); m_pModifiers = new ModifiersModule( this ); m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") ); - connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); } void KeyModule::load() @@ -146,7 +147,7 @@ TQString KeyModule::handbookSection() const extern "C" { - KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 TDEGlobal::locale()->insertCatalogue("twin"); @@ -155,7 +156,7 @@ extern "C" return new KeyModule(parent, "kcmkeys"); } - KDE_EXPORT void initModifiers() + TDE_EXPORT void initModifiers() { kdDebug(125) << "KeyModule::initModifiers()" << endl; @@ -165,7 +166,7 @@ extern "C" ModifiersModule::setupMacModifierKeys(); } - KDE_EXPORT void init_keys() + TDE_EXPORT void init_keys() { kdDebug(125) << "KeyModule::init()\n"; @@ -181,9 +182,9 @@ extern "C" kdDebug(125) << "KeyModule::init() - Load Included Bindings\n"; // this should match the included files above #define NOSLOTS -#define SHIFT Qt::SHIFT -#define CTRL Qt::CTRL -#define ALT Qt::ALT +#define SHIFT TQt::SHIFT +#define CTRL TQt::CTRL +#define ALT TQt::ALT #include "../../klipper/klipperbindings.cpp" #include "../../twin/twinbindings.cpp" #define KICKER_ALL_BINDINGS diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h index 281b2d37a..1830438a9 100644 --- a/kcontrol/keys/main.h +++ b/kcontrol/keys/main.h @@ -33,7 +33,7 @@ class ModifiersModule; class KeyModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KeyModule( TQWidget *parent, const char *name ); ~KeyModule(); diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 39dfb7010..f8c887c45 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -116,7 +116,7 @@ void ModifiersModule::save() if( bMacSwap ) setupMacModifierKeys(); else - kapp->tdeinitExec("kxkb"); + tdeApp->tdeinitExec("kxkb"); m_bMacSwapOrig = bMacSwap; updateWidgets(); } @@ -172,7 +172,7 @@ void ModifiersModule::initGUI() TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() ); pLayoutTop->setColStretch( 1, 1 ); - TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this ); + TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this ); pLayoutTop->addWidget( pGroup, 0, 0 ); TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup ); @@ -183,13 +183,13 @@ void ModifiersModule::initGUI() plbl = new TQLabel( i18n("X11-Mod"), pGroup ); plbl->setFont( font ); - new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup ); + new TQLabel( i18n("TQAccel", "Shift"), pGroup ); new TQLabel( "shift", pGroup ); - m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup ); + m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup ); new TQLabel( "control", pGroup ); - m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup ); + m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup ); new TQLabel( "mod1", pGroup ); m_plblWin = new TQLabel( i18n("Win"), pGroup ); @@ -207,7 +207,7 @@ void ModifiersModule::initGUI() m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this ); m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig ); - connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) ); + connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) ); pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 ); m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this ); @@ -220,13 +220,13 @@ void ModifiersModule::initGUI() "<b>Command</b> will be used for application and console commands, " "<b>Option</b> as a command modifier and for navigating menus and dialogs, " "and <b>Control</b> for window manager commands.") ); - connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) ); + connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) ); pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 ); //------------------ pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 ); - pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this ); + pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this ); pLayoutTop->addWidget( pGroup, 4, 0 ); m_plstXMods = new TDEListView( pGroup ); @@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets() } m_pchkMacSwap->setEnabled( true ); } else { - m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") ); - m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") ); + m_plblCtrl->setText( i18n("TQAccel", "Ctrl") ); + m_plblAlt->setText( i18n("TQAccel", "Alt") ); m_plblWin->setText( i18n("Win") ); m_pchkMacSwap->setEnabled( false ); } diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index b600bfafb..64b73fa5b 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -10,7 +10,7 @@ class TDEListView; class ModifiersModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ModifiersModule( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index e7f599dda..c225e5f68 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -39,8 +39,9 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeshortcutlist.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> +#include <dcopref.h> ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name ) : TQWidget( parent, name ) @@ -139,21 +140,21 @@ void ShortcutsModule::initGUI() pGroup->hide(); m_prbPre = new TQRadioButton( "", this ); - connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) ); + connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) ); pGroup->insert( m_prbPre ); pHLayout->addWidget( m_prbPre ); m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); - connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); + connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); pHLayout->addSpacing( KDialog::marginHint() ); m_pbtnRemove = new TQPushButton( i18n("&Remove"), this ); m_pbtnRemove->setEnabled( false ); - connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) ); + connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) ); TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot" " remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") ); pHLayout->addWidget( m_pbtnRemove ); @@ -168,7 +169,7 @@ void ShortcutsModule::initGUI() m_pbtnSave = new TQPushButton( i18n("&Save..."), this ); m_pbtnSave->setEnabled( false ); TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") ); - connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) ); + connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) ); pHLayout->addWidget( m_pbtnSave ); pHLayout->addStretch( 1 ); @@ -196,20 +197,20 @@ void ShortcutsModule::initGUI() m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); - connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); + connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) ); } m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") ); - connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true ); m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false ); m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") ); - connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); m_pListApplication = new TDEStdAccel::ShortcutList; m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false ); m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") ); - connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); kdDebug(125) << "G-----------" << endl; readSchemeNames(); @@ -281,7 +282,7 @@ void ShortcutsModule::readSchemeNames() //if( r.search( *it ) != -1 ) // continue; - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); config.setGroup( "Settings" ); TQString str = config.readEntry( "Name" ); @@ -323,7 +324,7 @@ void ShortcutsModule::slotSelectScheme( int ) m_pkcSequence->syncToConfig( "Global Shortcuts", 0, true ); m_pkcApplication->syncToConfig( "Shortcuts", 0, false ); } else { - KSimpleConfig config( sFilename ); + TDESimpleConfig config( sFilename ); config.setGroup( "Settings" ); //m_sBaseSchemeFile = config.readEntry( "Name" ); @@ -404,7 +405,7 @@ void ShortcutsModule::slotSaveSchemeAs() return; } while( !bNameValid ); - disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) ); + disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) ); TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); @@ -426,7 +427,7 @@ void ShortcutsModule::slotSaveSchemeAs() m_pcbSchemes->setCurrentItem( iScheme ); } - KSimpleConfig *config = new KSimpleConfig( sFile ); + TDESimpleConfig *config = new TDESimpleConfig( sFile ); config->setGroup( "Settings" ); config->writeEntry( "Name", sName ); @@ -434,14 +435,14 @@ void ShortcutsModule::slotSaveSchemeAs() saveScheme(); - connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); + connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) ); slotSelectScheme(); } void ShortcutsModule::saveScheme() { TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ]; - KSimpleConfig config( sFilename ); + TDESimpleConfig config( sFilename ); m_pkcGeneral->commitChanges(); m_pkcSequence->commitChanges(); diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index c1f1b2822..2ffc0e68f 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -35,7 +35,7 @@ class ShortcutsModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~ShortcutsModule(); diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 36d0e3bf4..7cb5de9b5 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kiconloader.h> #include <kservicegroup.h> @@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name ) addColumn(i18n("Shortcut")); addColumn(i18n("Alternate")); - connect(this, TQT_SIGNAL(clicked( TQListViewItem* )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this, TQ_SIGNAL(clicked( TQListViewItem* )), + TQ_SLOT(itemSelected( TQListViewItem* ))); - connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + TQ_SLOT(itemSelected( TQListViewItem* ))); } AppTreeView::~AppTreeView() @@ -122,7 +122,7 @@ AppTreeView::~AppTreeView() void AppTreeView::fill() { - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); clear(); fillBranch(TQString::null, 0); TQApplication::restoreOverrideCursor(); diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index 4da6d2351..a61cf591a 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -26,7 +26,7 @@ class TQPopupMenu; class TDEActionCollection; -class KDesktopFile; +class TDEDesktopFile; class AppTreeItem : public TDEListViewItem { @@ -61,7 +61,7 @@ private: class AppTreeView : public TDEListView { friend class AppTreeItem; - Q_OBJECT + TQ_OBJECT public: AppTreeView(TQWidget *parent=0, const char *name=0); ~AppTreeView(); diff --git a/kcontrol/keys/trinity.kksrc b/kcontrol/keys/trinity.kksrc index 57681b60f..2339b9186 100644 --- a/kcontrol/keys/trinity.kksrc +++ b/kcontrol/keys/trinity.kksrc @@ -75,8 +75,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+Ctrl+Escape Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -86,6 +87,7 @@ Show Klipper Popup-Menu=Alt+Ctrl+V Show Taskmanager=Ctrl+Escape Show Window List=Alt+F5 Start Screen Saver=Alt+Ctrl+S +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/unix3.kksrc b/kcontrol/keys/unix3.kksrc index 8ac722ec6..de091abc7 100644 --- a/kcontrol/keys/unix3.kksrc +++ b/kcontrol/keys/unix3.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+F9 Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Ctrl+Escape Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/win3.kksrc b/kcontrol/keys/win3.kksrc index 926f83670..a7ae3adbc 100644 --- a/kcontrol/keys/win3.kksrc +++ b/kcontrol/keys/win3.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=none Lock Session=none -Logout=none -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=none +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=none Mouse Emulation=none Popup Launch Menu=Ctrl+Escape @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Alt+Ctrl+Delete Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/win4.kksrc b/kcontrol/keys/win4.kksrc index 1abb69313..3c53ecd25 100644 --- a/kcontrol/keys/win4.kksrc +++ b/kcontrol/keys/win4.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=none Lock Session=none -Logout=none -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=none +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=none Mouse Emulation=none Popup Launch Menu=Ctrl+Escape @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Alt+Ctrl+Delete Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/wm3.kksrc b/kcontrol/keys/wm3.kksrc index 6c6ef61e5..70abfbf94 100644 --- a/kcontrol/keys/wm3.kksrc +++ b/kcontrol/keys/wm3.kksrc @@ -71,8 +71,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+Ctrl+Escape Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -81,6 +82,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=Alt+Ctrl+V Show Taskmanager=Ctrl+Escape Show Window List=Alt+F5 +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index f2ba15680..e9ed08b0a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -40,10 +40,10 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) name, false, false) { - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(save())); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(save())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(save())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(save())); TQFrame* page = plainPage(); TQVBoxLayout* layout = new TQVBoxLayout(page); @@ -53,22 +53,22 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) setMinimumSize( sizeHint() ); - connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelBlurred, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerResizeHandle, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerDeepButtons, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); + connect(m_advancedWidget->handles, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->hideButtonSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintColorB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->blurSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->menubarPanelTransparent, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerResizeHandle, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerDeepButtons, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); load(); } @@ -97,10 +97,21 @@ void advancedDialog::load() int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); + // Compatibility with deprecated MenubarPanelBlurred option + int blurValue = 0; + if (c.hasKey("MenubarPanelBlurred")) + { + if (c.readNumEntry("MenubarPanelBlurred", false)) + { + blurValue = 4; + } + c.deleteEntry("MenubarPanelBlurred"); + } + blurValue = c.readNumEntry("BlurValue", blurValue); + m_advancedWidget->blurSlider->setValue(blurValue); + bool transparentMenubarPanel = c.readBoolEntry("MenubarPanelTransparent", false); m_advancedWidget->menubarPanelTransparent->setChecked( transparentMenubarPanel ); - bool blurredMenubarPanel = c.readBoolEntry("MenubarPanelBlurred", false); - m_advancedWidget->menubarPanelBlurred->setChecked( blurredMenubarPanel ); bool useKickerResizeHandle = c.readBoolEntry("UseResizeHandle", false); m_advancedWidget->kickerResizeHandle->setChecked( useKickerResizeHandle ); @@ -125,10 +136,10 @@ void advancedDialog::save() m_advancedWidget->tintColorB->color()); c.writeEntry("TintValue", m_advancedWidget->tintSlider->value()); + c.writeEntry("BlurValue", + m_advancedWidget->blurSlider->value()); c.writeEntry("MenubarPanelTransparent", m_advancedWidget->menubarPanelTransparent->isChecked()); - c.writeEntry("MenubarPanelBlurred", - m_advancedWidget->menubarPanelBlurred->isChecked()); c.writeEntry("UseResizeHandle", m_advancedWidget->kickerResizeHandle->isChecked()); c.writeEntry("ShowDeepButtons", @@ -161,10 +172,10 @@ void advancedDialog::save() m_advancedWidget->tintColorB->color()); extConfig.writeEntry("TintValue", m_advancedWidget->tintSlider->value()); + extConfig.writeEntry("BlurValue", + m_advancedWidget->blurSlider->value()); extConfig.writeEntry("MenubarPanelTransparent", m_advancedWidget->menubarPanelTransparent->isChecked()); - extConfig.writeEntry("MenubarPanelBlurred", - m_advancedWidget->menubarPanelBlurred->isChecked()); extConfig.writeEntry("UseResizeHandle", m_advancedWidget->kickerResizeHandle->isChecked()); extConfig.writeEntry("ShowDeepButtons", @@ -172,7 +183,7 @@ void advancedDialog::save() extConfig.sync(); } - + c.sync(); KickerConfig::the()->notifyKicker(); diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h index 12a2ef4bd..a0ffdff6d 100644 --- a/kcontrol/kicker/advancedDialog.h +++ b/kcontrol/kicker/advancedDialog.h @@ -26,7 +26,7 @@ class advancedKickerOptions; class advancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: advancedDialog(TQWidget* parent, const char* name); diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index b1e0aaf37..0e65401db 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -8,21 +8,30 @@ <rect> <x>0</x> <y>0</y> - <width>324</width> - <height>235</height> + <width>425</width> + <height>360</height> </rect> </property> + <property name="caption"> + <string>advancedKickerOptions</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <property name="margin"> - <number>0</number> + <number>5</number> </property> <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Panel Dimensions</string> </property> @@ -84,6 +93,12 @@ <property name="name"> <cstring>handles</cstring> </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Applet Handles</string> </property> @@ -158,6 +173,20 @@ <property name="name"> <cstring>groupBox2</cstring> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Transparency</string> </property> @@ -165,77 +194,179 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KColorButton" row="0" column="1"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> - <cstring>tintColorB</cstring> + <cstring>textLabel1_2</cstring> </property> <property name="sizePolicy"> <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string></string> + <string>Ti&nt amount:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>tintSlider</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Click on this button to set the color to use when tinting transparent panels.</string> + <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + </property> + </widget> + <widget class="TQLabel" row="4" column="3"> + <property name="name"> + <cstring>textLabel2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + <property name="whatsThis" stdset="0"> + <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + </property> + </widget> + <widget class="TQLabel" row="6" column="3"> + <property name="name"> + <cstring>textLabel2_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max blur</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + <property name="whatsThis" stdset="0"> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <spacer row="2" column="0"> + <spacer row="7" column="2"> <property name="name"> - <cstring>spacer2</cstring> + <cstring>spacer2_2_2</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> <property name="sizeType"> - <enum>Expanding</enum> + <enum>Maximum</enum> </property> <property name="sizeHint"> <size> <width>20</width> - <height>21</height> + <height>16</height> </size> </property> </spacer> - <widget class="TQLabel" row="2" column="1"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> - <cstring>textLabel3</cstring> + <cstring>textLabel1_2_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Min</string> + <string>&Blur amount:</string> </property> - <property name="alignment"> - <set>AlignVCenter|AlignLeft</set> + <property name="buddy" stdset="0"> + <cstring>blurSlider</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <spacer row="0" column="2"> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Tint c&olor:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>tintColorB</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string>Click on this button to set the color to use when tinting transparent panels.</string> + </property> + </widget> + <spacer row="6" column="0"> <property name="name"> - <cstring>spacer3</cstring> + <cstring>spacer2_2</cstring> </property> <property name="orientation"> - <enum>Horizontal</enum> + <enum>Vertical</enum> </property> <property name="sizeType"> - <enum>Expanding</enum> + <enum>Maximum</enum> </property> <property name="sizeHint"> <size> - <width>81</width> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + <spacer row="4" column="0"> + <property name="name"> + <cstring>spacer2_2_2_2</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>MinimumExpanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="TQSlider" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="2" column="1" rowspan="2" colspan="3"> <property name="name"> <cstring>tintSlider</cstring> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="orientation"> <enum>Horizontal</enum> </property> @@ -243,49 +374,87 @@ <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="TQLabel" row="2" column="2"> + <widget class="KColorButton" row="0" column="1"> <property name="name"> - <cstring>textLabel2</cstring> + <cstring>tintColorB</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Max</string> + <string></string> + </property> + <property name="whatsThis" stdset="0"> + <string>Click on this button to set the color to use when tinting transparent panels.</string> + </property> + </widget> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>textLabel3</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Min</string> </property> <property name="alignment"> - <set>AlignVCenter|AlignRight</set> + <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="TQLabel" row="1" column="0"> + <widget class="TQSlider" row="5" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>textLabel1_2</cstring> + <cstring>blurSlider</cstring> </property> - <property name="text"> - <string>Ti&nt amount:</string> + <property name="minValue"> + <number>0</number> </property> - <property name="buddy" stdset="0"> - <cstring>tintSlider</cstring> + <property name="maxValue"> + <number>10</number> + </property> + <property name="orientation"> + <enum>Horizontal</enum> </property> <property name="whatsThis" stdset="0"> - <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <widget class="TQLabel" row="0" column="0"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> - <cstring>textLabel1</cstring> + <cstring>textLabel3_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Tint c&olor:</string> + <string>No blur</string> </property> - <property name="buddy" stdset="0"> - <cstring>tintColorB</cstring> + <property name="alignment"> + <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> - <string>Click on this button to set the color to use when tinting transparent panels.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>menubarPanelTransparent</cstring> </property> @@ -296,54 +465,49 @@ <string>Normally if you have the desktop's or current application's menu bar displayed in a panel at the top of the screen (MacOS-style), transparency is disabled for this panel to avoid the desktop background clashing with the menu bar. Set this option to make it transparent anyways.</string> </property> </widget> - <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> + </grid> + </widget> + <widget class="TQGroupBox"> + <property name="name"> + <cstring>groupBox3</cstring> + </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> + <property name="title"> + <string>Texture</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> - <cstring>menubarPanelBlurred</cstring> + <cstring>kickerResizeHandle</cstring> </property> <property name="text"> - <string>Blur the background when transparency is enabled</string> + <string>Show resize handle on panels</string> </property> <property name="whatsThis" stdset="0"> - <string>When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain.</string> + <string>Enabling this option will show a resize handle on the resizable end of each panel.</string> + </property> + </widget> + <widget class="TQCheckBox" row="0" column="1"> + <property name="name"> + <cstring>kickerDeepButtons</cstring> + </property> + <property name="text"> + <string>Use deep buttons</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Enabling this option will yield more highly textured panels.</string> </property> </widget> </grid> </widget> - <widget class="TQGroupBox"> - <property name="name"> - <cstring>groupBox3</cstring> - </property> - <property name="title"> - <string>Texture</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQCheckBox" row="0" column="0" rowspan="0" colspan="2"> - <property name="name"> - <cstring>kickerResizeHandle</cstring> - </property> - <property name="text"> - <string>Show resize handle on panels</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Enabling this option will show a resize handle on the resizable end of each panel.</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="2" rowspan="0" colspan="2"> - <property name="name"> - <cstring>kickerDeepButtons</cstring> - </property> - <property name="text"> - <string>Use deep buttons</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Enabling this option will yield more highly textured panels.</string> - </property> - </widget> - </grid> - </widget> </vbox> </widget> <tabstops> @@ -358,6 +522,7 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index c2f488550..a03d1d157 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -31,7 +31,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelistview.h> #include <kdebug.h> @@ -42,16 +42,16 @@ AppletTab::AppletTab( TQWidget *parent, const char* name ) : AppletTabBase (parent, name) { - connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int))); + connect(level_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(level_changed(int))); - connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(trusted_selection_changed(TQListViewItem*))); + connect(lb_trusted, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(trusted_selection_changed(TQListViewItem*))); - connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked())); - connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked())); + connect(pb_add, TQ_SIGNAL(clicked()), TQ_SLOT(add_clicked())); + connect(pb_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove_clicked())); - connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(available_selection_changed(TQListViewItem*))); + connect(lb_available, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(available_selection_changed(TQListViewItem*))); pb_add->setEnabled(false); pb_remove->setEnabled(false); diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h index a92e166d6..14a082c17 100644 --- a/kcontrol/kicker/applettab_impl.h +++ b/kcontrol/kicker/applettab_impl.h @@ -33,7 +33,7 @@ class TQListViewItem; class AppletTab : public AppletTabBase { - Q_OBJECT + TQ_OBJECT public: AppletTab( TQWidget *parent=0, const char* name=0 ); diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index a773e063d..bd0bd2f11 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -19,7 +19,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include "extensionInfo.h" @@ -54,7 +54,7 @@ void ExtensionInfo::load() } else { - KDesktopFile df(_desktopFile); + TDEDesktopFile df(_desktopFile); _name = df.readName(); _resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable); diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 506eebdfb..d94f18bfa 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -41,13 +41,13 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void HidingConfig::notChanged() @@ -90,7 +90,7 @@ void HidingConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString HidingConfig::handbookSection() const diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h index 1a6e22472..427201c62 100644 --- a/kcontrol/kicker/hidingconfig.h +++ b/kcontrol/kicker/hidingconfig.h @@ -24,7 +24,7 @@ class HidingTab; class HidingConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: HidingConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index fae21c356..b0a9088cb 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -764,9 +764,9 @@ <include location="global" impldecl="in implementation">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">switchPanel(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index 8c340bd5d..382c1a84e 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -38,33 +38,33 @@ HidingTab::HidingTab(TQWidget *parent, const char* name) m_panelInfo(0) { // connections - connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_xineramaHide, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); + connect(m_manual,TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_xineramaHide, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_hideSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_animateHiding, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_autoHideSwitch, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundRaise, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundPos, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_lHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_rHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)), - TQT_SLOT(switchPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int))); + connect(KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)), + TQ_SLOT(switchPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int))); } void HidingTab::load() diff --git a/kcontrol/kicker/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h index 34bc6a372..f5cd67ed1 100644 --- a/kcontrol/kicker/hidingtab_impl.h +++ b/kcontrol/kicker/hidingtab_impl.h @@ -26,7 +26,7 @@ class ExtensionInfo; class HidingTab : public HidingTabBase { - Q_OBJECT + TQ_OBJECT public: HidingTab(TQWidget *parent = 0, const char* name = 0); diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index d7cbadf28..082753cb9 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void LookAndFeelConfig::notChanged() @@ -90,7 +90,7 @@ void LookAndFeelConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString LookAndFeelConfig::handbookSection() const diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h index ff8a55b38..f35a33f45 100644 --- a/kcontrol/kicker/lookandfeelconfig.h +++ b/kcontrol/kicker/lookandfeelconfig.h @@ -24,7 +24,7 @@ class LookAndFeelTab; class LookAndFeelConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 803393e66..fcc746f57 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -624,11 +624,11 @@ This option is only active if 'Enable background image' is selected.</string> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot> <slot access="protected" specifier="pure virtual">browseTheme(const TQString&)</slot> <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 674b1cd04..cc8c61515 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -31,7 +31,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kickerSettings.h> #include "advancedDialog.h" @@ -48,21 +48,21 @@ LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name ) : LookAndFeelTabBase(parent, name), m_advDialog(0) { - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int))); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int))); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int))); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int))); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int))); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SLOT(kmenuTileChanged(int))); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SLOT(desktopTileChanged(int))); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SLOT(browserTileChanged(int))); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SLOT(urlTileChanged(int))); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SLOT(wlTileChanged(int))); - connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme())); + connect(kcfg_ColorizeBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(browseTheme())); - connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme())); + connect(kcfg_BackgroundTheme->lineEdit(), TQ_SIGNAL(lostFocus()), TQ_SLOT(browseTheme())); kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading)); kcfg_BackgroundTheme->setCaption(i18n("Select Image File")); @@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog() if (!m_advDialog) { m_advDialog = new advancedDialog(this, "advancedDialog"); - connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog())); + connect(m_advDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(finishAdvancedDialog())); m_advDialog->show(); } m_advDialog->setActiveWindow(); diff --git a/kcontrol/kicker/lookandfeeltab_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h index 704a359db..49c366dfe 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.h +++ b/kcontrol/kicker/lookandfeeltab_impl.h @@ -28,7 +28,7 @@ class advancedDialog; class LookAndFeelTab : public LookAndFeelTabBase { - Q_OBJECT + TQ_OBJECT public: LookAndFeelTab(TQWidget *parent = 0, const char* name = 0); diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 5695e3869..a703ea966 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -48,7 +48,7 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) layout->addWidget(lookandfeeltab); layout->addStretch(); - connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); + connect(lookandfeeltab, TQ_SIGNAL(changed()), TQ_SLOT(configChanged())); load(); } diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h index 32a89b4f8..54df41784 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.h +++ b/kcontrol/kicker/lookandfeeltab_kcm.h @@ -24,7 +24,7 @@ class LookAndFeelTab; class LookAndFeelConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index da73da7c3..ae5260f6e 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -25,7 +25,7 @@ #include <kimageio.h> #include <tdelistview.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "hidingconfig.h" @@ -63,15 +63,15 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name) init(); - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)", "jumpToPanel(TQString)", false); - kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); - connect(this, TQT_SIGNAL(hidingPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); - connect(this, TQT_SIGNAL(positionPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(hidingPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(positionPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); } KickerConfig::~KickerConfig() @@ -90,7 +90,7 @@ KickerConfig::~KickerConfig() // this method may get called multiple times during the life of the control panel! void KickerConfig::init() { - disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->stopScan(); for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); @@ -128,20 +128,20 @@ void KickerConfig::init() setupExtensionInfo(*config, true, true); - connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->startScan(); } void KickerConfig::restartKicker() { // Tell kicker to restart - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQCString appname; appname = "kicker"; - kapp->dcopClient()->send(appname, appname, "restart", TQString("")); + tdeApp->dcopClient()->send(appname, appname, "restart", TQString("")); } void KickerConfig::notifyKicker() @@ -151,9 +151,9 @@ void KickerConfig::notifyKicker() emit aboutToNotifyKicker(); // Tell kicker about the new config file. - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQByteArray data; @@ -168,7 +168,7 @@ void KickerConfig::notifyKicker() appname.sprintf("kicker-screen-%d", m_screenNumber); } - kapp->dcopClient()->send(appname, appname, "configure()", data); + tdeApp->dcopClient()->send(appname, appname, "configure()", data); } void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists) @@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData() extern "C" { - KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) { TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker"); container->addModule("kicker_config_arrangement"); @@ -381,26 +381,26 @@ extern "C" return container; } - KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) { return new MenuConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") + diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 06bf2ec03..9b832ab38 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -29,7 +29,7 @@ class KDirWatch; class KickerConfig : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 4f8a68605..6773105c6 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -41,13 +41,13 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void MenuConfig::notChanged() @@ -90,7 +90,7 @@ void MenuConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changedm, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString MenuConfig::handbookSection() const diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h index a5fa29daf..373e1cbf8 100644 --- a/kcontrol/kicker/menuconfig.h +++ b/kcontrol/kicker/menuconfig.h @@ -24,7 +24,7 @@ class MenuTab; class MenuConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: MenuConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index fbd15cd8d..44643d366 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -29,13 +29,13 @@ #include <dcopref.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefontrequester.h> #include <kkeybutton.h> #include <tdemessagebox.h> @@ -79,12 +79,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) m_kmenu_button_changed(false) { // connections - connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor())); - connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor())); - connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(kmenuChanged())); - connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged())); - //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); - connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged())); + connect(m_editKMenuButton, TQ_SIGNAL(clicked()), TQ_SLOT(launchMenuEditor())); + connect(btnCustomKMenuIcon, TQ_SIGNAL(clicked()), TQ_SLOT(launchIconEditor())); + connect(kcfg_KMenuText, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(kmenuChanged())); + connect(kcfg_ShowKMenuText, TQ_SIGNAL(toggled(bool)), TQ_SLOT(kmenuChanged())); + //connect(kcfg_ButtonFont, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(kmenuChanged())); + connect(maxrecentdocs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(kmenuChanged())); // FIXME // When top pixmap support is ready for end-user visibility, replace @@ -129,7 +129,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("bookmark"), c->readBoolEntry("UseBookmarks", false)); - connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_bookmarkMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); // show the quick menus menu? m_quickBrowserMenu = new kSubMenuItem(m_subMenus, @@ -137,7 +137,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("kdisknav"), c->readBoolEntry("UseBrowser", false)); - connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_quickBrowserMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; @@ -150,13 +150,13 @@ void MenuTab::load( bool useDefaults ) TQStringList av = d.entryList(); for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) { - KDesktopFile df(d.absFilePath(*it), true); + TDEDesktopFile df(d.absFilePath(*it), true); menuItem = new kSubMenuItem(m_subMenus, df.readName(), *it, SmallIcon(df.readIcon()), tqFind(ext.begin(), ext.end(), *it) != ext.end()); - connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(menuItem, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); } } @@ -165,16 +165,16 @@ void MenuTab::load( bool useDefaults ) m_openOnHover->setChecked( c->readBoolEntry("OpenOnHover", true) ); menuStyleChanged(); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SLOT(menuStyleChanged())); - connect(m_openOnHover, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SLOT(menuStyleChanged())); + connect(m_openOnHover, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); m_showFrequent->setChecked(true); c->setGroup("KMenu"); m_searchShortcut->setShortcut(TDEShortcut(c->readEntry("SearchShortcut", "/")), false); - connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SIGNAL(changed())); - connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(setSearchShortcut(const TDEShortcut&))); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SIGNAL(changed())); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(setSearchShortcut(const TDEShortcut&))); if ( useDefaults ) emit changed(); diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h index 509623d61..1344f2950 100644 --- a/kcontrol/kicker/menutab_impl.h +++ b/kcontrol/kicker/menutab_impl.h @@ -28,7 +28,7 @@ class kSubMenuItem : public TQObject, public TQCheckListItem { - Q_OBJECT + TQ_OBJECT public: kSubMenuItem(TQListView* parent, @@ -51,7 +51,7 @@ class kSubMenuItem : public TQObject, public TQCheckListItem class MenuTab : public MenuTabBase { - Q_OBJECT + TQ_OBJECT public: MenuTab( TQWidget *parent=0, const char* name=0 ); diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 00b571d13..cd871ae22 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -41,13 +41,13 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void PositionConfig::notChanged() @@ -90,7 +90,7 @@ void PositionConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString PositionConfig::handbookSection() const diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h index 93d7cb533..264533e7e 100644 --- a/kcontrol/kicker/positionconfig.h +++ b/kcontrol/kicker/positionconfig.h @@ -24,7 +24,7 @@ class PositionTab; class PositionConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PositionConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index 6729d0cf2..fb3427b03 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -380,7 +380,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <string>Si&ze</string> </property> <property name="whatsThis" stdset="0"> - <string>This sets the size of the panel.</string> + <string>This sets the height of the panel. Tiny is 24 pixels high, Small is 30 pixels, Normal is 46 pixels, Large is 58 pixels.</string> </property> <grid> <property name="name"> @@ -1112,12 +1112,12 @@ how it is positioned on the screen and how much of the screen it should use.</st <include location="global" impldecl="in implementation">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot> <slot access="protected" specifier="pure virtual">movePanel( int )</slot> <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot> <slot specifier="pure virtual">switchPanel( int )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 63cdb35a9..ffbfc833e 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -33,7 +33,7 @@ #include <knuminput.h> #include <kpanelextension.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include "main.h" @@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) /* * set the tooltips on the buttons properly for RTL langs */ - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { TQToolTip::add(locationTopRight, i18n("Top left")); TQToolTip::add(locationTop, i18n("Top center")); @@ -104,10 +104,10 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) } // connections - connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed())); + connect(m_locationGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_xineramaScreenComboBox, TQ_SIGNAL(highlighted(int)), TQ_SIGNAL(changed())); - connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify())); + connect(m_identifyButton,TQ_SIGNAL(clicked()),TQ_SLOT(showIdentify())); for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* populate the combobox for the available screens */ @@ -123,38 +123,38 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) m_xineramaScreenLabel->hide(); } - connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_percentSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_percentSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_expandCheckBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); - connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_sizeGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_customSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_customSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); m_desktopPreview = new KVirtualBGRenderer(0); - connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)), - TQT_SLOT(slotBGPreviewReady(int))); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)), - TQT_SLOT(extensionChanged(const TQString&))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)), - TQT_SLOT(extensionAboutToChange(const TQString&))); + connect(m_desktopPreview, TQ_SIGNAL(imageDone(int)), + TQ_SLOT(slotBGPreviewReady(int))); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionChanged(const TQString&)), + TQ_SLOT(extensionChanged(const TQString&))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAboutToChange(const TQString&)), + TQ_SLOT(extensionAboutToChange(const TQString&))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)), - TQT_SLOT(jumpToPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int))); - - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SLOT(sizeChanged(int))); - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SIGNAL(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)), + TQ_SLOT(jumpToPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int))); + + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SLOT(sizeChanged(int))); + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SIGNAL(changed())); } PositionTab::~PositionTab() @@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosTop; } else if (pushed == locationTop) @@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosTop; } else if (pushed == locationLeftTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeft) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeftBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationBottomLeft) { @@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosBottom; } else if (pushed == locationBottom) @@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosBottom; } else if (pushed == locationRightTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRight) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRightBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } lengthenPanel(-1); @@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() { if (m_panelPos == PosTop) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationTopRight->setOn(true) : + tdeApp->reverseLayout() ? locationTopRight->setOn(true) : locationTopLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationTop->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationTopLeft->setOn(true) : + tdeApp->reverseLayout() ? locationTopLeft->setOn(true) : locationTopRight->setOn(true); } else if (m_panelPos == PosRight) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationLeftTop->setOn(true) : + tdeApp->reverseLayout() ? locationLeftTop->setOn(true) : locationRightTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationLeft->setOn(true) : + tdeApp->reverseLayout() ? locationLeft->setOn(true) : locationRight->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationLeftBottom->setOn(true) : + tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) : locationRightBottom->setOn(true); } else if (m_panelPos == PosBottom) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationBottomRight->setOn(true) : + tdeApp->reverseLayout() ? locationBottomRight->setOn(true) : locationBottomLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationBottom->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationBottomLeft->setOn(true) : + tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) : locationBottomRight->setOn(true); } else // if (m_panelPos == PosLeft { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationRightTop->setOn(true) : + tdeApp->reverseLayout() ? locationRightTop->setOn(true) : locationLeftTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationRight->setOn(true) : + tdeApp->reverseLayout() ? locationRight->setOn(true) : locationLeft->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationRightBottom->setOn(true) : + tdeApp->reverseLayout() ? locationRightBottom->setOn(true) : locationLeftBottom->setOn(true); } @@ -696,11 +696,11 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->setAlignment(TQt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); diff --git a/kcontrol/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h index 4740a8a61..31868fef9 100644 --- a/kcontrol/kicker/positiontab_impl.h +++ b/kcontrol/kicker/positiontab_impl.h @@ -29,7 +29,7 @@ class ExtensionInfo; class PositionTab : public PositionTabBase { - Q_OBJECT + TQ_OBJECT public: PositionTab(TQWidget *parent, const char* name = 0); diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index b703b9b35..785ee7c0c 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -32,7 +32,7 @@ #include <tdeconfig.h> #include <knotifydialog.h> #include <tdeparts/genericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlcompletion.h> #include <kurlrequester.h> @@ -74,15 +74,15 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); - connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); + connect( m_notifyWidget, TQ_SIGNAL( changed( bool )), TQ_SIGNAL( changed(bool))); layout->addWidget( m_notifyWidget ); - connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotAppActivated( const TQString& )) ); + connect( m_appCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotAppActivated( const TQString& )) ); - connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotPlayerSettings())); + connect( m_notifyWidget->m_playerButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotPlayerSettings())); TDEAboutData* ab = new TDEAboutData( "kcmknotify", I18N_NOOP("KNotify"), "3.0", @@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal ) dataChanged = false; enableButton(Apply, false); - connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) ); - connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) ); - connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); - connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( m_ui->cbExternal, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( externalToggled( bool ) ) ); + connect( m_ui->grpPlayers, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) ); + connect( m_ui->volumeSlider, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); + connect( m_ui->reqExternal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) ); } void PlayerSettingsDialog::load( bool useDefaults ) @@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply() save(); dataChanged = false; enableButton(Apply, false); - kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); KDialogBase::slotApply(); } diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 12aa35333..eb77bbf48 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -46,7 +46,7 @@ namespace KNotify class KCMKNotify : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMKNotify(TQWidget *parent, const char *name, const TQStringList &); @@ -74,7 +74,7 @@ private: class PlayerSettingsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PlayerSettingsDialog( TQWidget *parent, bool modal ); diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index d662d6af7..a6ab581ed 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -33,7 +33,7 @@ #include <tdeio/uiserver_stub.h> #include <tdelocale.h> #include <konq_defaults.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "behaviour.h" @@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox); TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " "you open a folder, rather than showing that folder's contents in the current window.")); - connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool))); + connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool))); // ---- cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox ); - connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the" " progress information for all network file transfers into a single window" @@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget // ---- cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox ); - connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived" " files as folders when using tree view.") ); @@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget // -- cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox ); - connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " "small popup window with additional information about that file." "This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style.")); - connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool))); + connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool))); /* - //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool))); - //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool))); fileTips->setBuddy(sbToolTip); TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " "additional information about that file. Here, you can set how many items of information " @@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); - connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " "popup window to contain a larger preview for the file, when moving the mouse over it.")); @@ -124,7 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox); TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " "renamed by clicking directly on the icon name. ")); - connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + + cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox); + TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an " + "empty area will navigate to the parent folder.")); + connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQHBoxLayout *hlay = new TQHBoxLayout( lay ); @@ -135,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget homeURL->setMode(KFile::Directory); homeURL->setCaption(i18n("Select Home Folder")); hlay->addWidget( homeURL ); - connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); label->setBuddy(homeURL); TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where " @@ -148,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); lay->addWidget( cbShowDeleteCommand ); - connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " "on the desktop and in the file manager's context menus. " @@ -164,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget " <li><em>Delete:</em> simply deletes the file.</li>" " </li></ul>") ); - connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() )); + connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() )); cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg ); @@ -213,6 +218,8 @@ void KBehaviourOptions::load( bool useDefaults ) cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly", DEFAULT_RENAMEICONDIRECTLY ) ); + cbDoubleClickMoveToParent->setChecked(g_pConfig->readBoolEntry("DoubleClickMoveToParent", true)); + TDEConfig globalconfig("kdeglobals", true, false); globalconfig.setGroup( "KDE" ); cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) ); @@ -254,6 +261,7 @@ void KBehaviourOptions::save() // g_pConfig->writeEntry( "FileTipsItems", sbToolTip->value() ); g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked()); + g_pConfig->writeEntry( "DoubleClickMoveToParent", cbDoubleClickMoveToParent->isChecked()); TDEConfig sidebarconfig("konqsidebartng.rc"); sidebarconfig.setGroup( "" ); @@ -277,7 +285,7 @@ void KBehaviourOptions::save() config.sync(); // Tell the running server - if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); uiserver.setListMode( cbListProgress->isChecked() ); @@ -285,10 +293,10 @@ void KBehaviourOptions::save() // Send signal to konqueror TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); - kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data ); } TQString KBehaviourOptions::handbookSection() const diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index bb6421be3..ebb7d8511 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -35,7 +35,7 @@ class KURLRequester; class KBehaviourOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KBehaviourOptions(); @@ -68,6 +68,7 @@ private: TQCheckBox *cbShowTips; TQCheckBox *cbShowPreviewsInTips; TQCheckBox *cbRenameDirectlyIcon; + TQCheckBox *cbDoubleClickMoveToParent; TQCheckBox *cbMoveToTrash; TQCheckBox *cbDelete; diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 49587f2dc..4a8496eac 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa tab->addTab(kuick, i18n("&Quick Copy && Move")); } - connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); if (kuick) - connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); - connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), - this, TQT_SIGNAL(quickHelpChanged())); + connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)), + this, TQ_SIGNAL(quickHelpChanged())); m_tab = tab; } diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 0e0cee35c..1cb49eb02 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -29,7 +29,7 @@ class TQTabWidget; class KBrowserOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 5d5305b09..65212f68f 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -39,7 +39,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) { return new KDesktopConfig(parent, "kcmkonq"); } @@ -70,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group); _numInput = new KIntNumInput(4, number_group); _numInput->setRange(1, maxDesktops, 1, true); - connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); + connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); + connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); label->setBuddy( _numInput ); TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." ); TQWhatsThis::add( label, wtstr ); @@ -86,7 +86,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) // name group TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); - name_group->setColumnLayout(4, Qt::Horizontal); + name_group->setColumnLayout(4, TQt::Horizontal); for(int i = 0; i < (maxDesktops/2); i++) { @@ -99,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT( changed() )); - connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT( changed() )); + connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT( changed() )); + connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT( changed() )); } for(int i = 1; i < maxDesktops; i++) @@ -111,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) layout->addWidget(name_group); _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); - connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); layout->addWidget(_wheelOption); layout->addStretch(1); @@ -221,11 +221,11 @@ void KDesktopConfig::save() delete config; // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); emit changed(false); } diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index b7a05c3bc..9bdb8cb59 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -32,7 +32,7 @@ static const int maxDesktops = 20; class KDesktopConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L); diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 5c5fe2b95..41885202f 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -53,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); layout->addWidget(m_behavior); - connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); } void DesktopBehaviorModule::changed() @@ -127,16 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); - connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); - connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(lockInPlaceBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged())); - connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged())); - connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *))); - connect(spacingValue, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spacingChanged(int))); - connect(spacingCtrlScroll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed())); + connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged())); + connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged())); + connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *))); + connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int))); + connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); strMouseButton1 = i18n("&Left button:"); strButtonTxt1 = i18n( "You can choose what happens when" @@ -155,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char leftLabel->setText( strMouseButton1 ); leftLabel->setBuddy( leftComboBox ); fillMenuCombo( leftComboBox ); - connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); TQString wtstr = strButtonTxt1 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" @@ -177,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char middleLabel->setBuddy( middleComboBox ); fillMenuCombo( middleComboBox ); - connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); wtstr = i18n("You can choose what happens when" " you click the middle button of your pointing device on the desktop:" " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" @@ -201,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char rightLabel->setText( strMouseButton3 ); rightLabel->setBuddy( rightComboBox ); fillMenuCombo( rightComboBox ); - connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); wtstr = strButtonTxt3 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" @@ -223,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char if (m_bHasMedia) { - connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); + connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); } else { @@ -253,7 +253,7 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled) if (it->mimeType().startsWith("media/builtin-") == false) it->setVisible(enabled); else - it->setVisible(TRUE); + it->setVisible(true); } } @@ -418,8 +418,8 @@ void DesktopBehavior::save() g_pConfig->sync(); // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -428,11 +428,11 @@ void DesktopBehavior::save() appname = "kdesktop"; else appname.sprintf("kdesktop-screen-%d", konq_screen_number); - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); // for the standalone menubar setting - kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); - kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); - kapp->dcopClient()->send( "twin*", "", "reconfigure()", data ); + tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); + tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data ); } void DesktopBehavior::enableChanged() diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 8a1a5c247..bc8aad2d2 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -28,7 +28,7 @@ class DesktopBehavior : public DesktopBehaviorBase { - Q_OBJECT + TQ_OBJECT public: DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); @@ -69,7 +69,7 @@ private: class DesktopBehaviorModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L ); diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index a12b02069..ae03a0534 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( m_pStandard, wtstr ); row++; - connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); m_pSize = new TQSpinBox( 4,18,1,this ); label = new TQLabel( m_pSize, i18n("Font si&ze:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pSize,row,row,1,1); - connect( m_pSize, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotFontSize(int) ) ); + connect( m_pSize, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotFontSize(int) ) ); row+=2; wtstr = i18n("This is the font size used to display text in Konqueror windows."); @@ -94,14 +94,14 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop m_pNormalText = new KColorButton( normalTextColor, this ); label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); - lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); + lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pNormalText, wtstr ); - connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); + connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); /* row++; @@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pHighlightedText, wtstr ); - connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); + connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); */ row++; @@ -125,18 +125,18 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop { m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this ); lay->addWidget(m_cbTextBackground,row,0); - connect( m_cbTextBackground, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotTextBackgroundClicked() ) ); + connect( m_cbTextBackground, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); - lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); + lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pTextBackground, wtstr ); - connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); + connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); row++; } @@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbLines, row, 1 ); - connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( changed() ) ); - connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotPNbLinesChanged(int)) ); + connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( changed() ) ); + connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotPNbLinesChanged(int)) ); TQString thwt = i18n("This is the maximum number of lines that can be" " used to draw icon text. Long file names are" @@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbWidth, row, 1 ); - connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( changed() ) ); - connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotPNbWidthChanged(int)) ); + connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( changed() ) ); + connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotPNbWidthChanged(int)) ); thwt = i18n( "This is the maximum width for the icon text when konqueror " "is used in multi column view mode." ); @@ -179,8 +179,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop } cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); - lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign); - connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign); + connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" " being underlined, so that they look like links on a web page. Note:" @@ -192,8 +192,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop row++; m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); - lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign ); - connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); + lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign ); + connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) ); TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" " being displayed in bytes. Otherwise file sizes are" @@ -263,7 +263,7 @@ void KonqFontOptions::load( bool useDefaults ) m_pTextBackground->setColor( textBackgroundColor ); // Don't keep an invalid color around, otherwise checking the checkbox still gives invalid. if ( !textBackgroundColor.isValid() ) - textBackgroundColor = Qt::black; + textBackgroundColor = TQt::black; } else { @@ -330,9 +330,9 @@ void KonqFontOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); // Tell kdesktop about the new config file int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -341,7 +341,7 @@ void KonqFontOptions::save() appname = "kdesktop"; else appname.sprintf("kdesktop-screen-%d", konq_screen_number); - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } TQString KonqFontOptions::handbookSection() const diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 69ffa4af5..10e6837bd 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -51,7 +51,7 @@ class TDEFontCombo; class KonqFontOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0); TQString quickHelp() const; diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index 5ca7cb4ad..c4e3ea506 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -48,48 +48,48 @@ static TQCString configname() extern "C" { - KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) { TDEConfig *config = new TDEConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) { //TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 3b2349fc7..2e85ab609 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) m_maxSize->setRange( 0.2, 100, 0.2, true ); label->setBuddy( m_maxSize ); lay->addWidget( m_maxSize ); - connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) ); + connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) ); m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this); - connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); + connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) ); lay->addWidget(m_boostSize); m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this); - connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); + connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) ); lay->addWidget(m_useFileThumbnails); @@ -206,9 +206,9 @@ void KPreviewOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } TQString KPreviewOptions::handbookSection() const diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index d76b28560..4b9da1270 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -42,7 +42,7 @@ class KDoubleNumInput; class KPreviewOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 5da14f2f5..03c805588 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include <konq_defaults.h> // include default values directly from libkonq #include <kurlrequester.h> @@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDesktop->setMode( KFile::Directory ); tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); - connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); TQString wtstr = i18n("This folder contains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" @@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urAutostart->setMode( KFile::Directory ); tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); - connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever TDE starts. You can change the location of this" @@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDocument->setMode( KFile::Directory ); tmpLabel->setBuddy( urDocument ); lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL); - connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save documents from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urDocument, wtstr ); @@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDownload->setMode( KFile::Directory ); tmpLabel->setBuddy( urDownload ); lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL); - connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save downloads from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urDownload, wtstr ); @@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urMusic->setMode( KFile::Directory ); tmpLabel->setBuddy( urMusic ); lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL); - connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save music from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urMusic, wtstr ); @@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urPictures->setMode( KFile::Directory ); tmpLabel->setBuddy( urPictures ); lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL); - connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save pictures from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urPictures, wtstr ); @@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urPublicShare->setMode( KFile::Directory ); tmpLabel->setBuddy( urPublicShare ); lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL); - connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save public shared files from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urPublicShare, wtstr ); @@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urTemplates->setMode( KFile::Directory ); tmpLabel->setBuddy( urTemplates ); lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL); - connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save templates from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urTemplates, wtstr ); @@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urVideos->setMode( KFile::Directory ); tmpLabel->setBuddy( urVideos ); lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL); - connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save videos from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urVideos, wtstr ); @@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above loadTmr = new TQTimer(this); - connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone())); + connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone())); load(); } @@ -512,8 +512,8 @@ void DesktopPathConfig::save() } // Tell kdesktop about the new config file - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data; int konq_screen_number = TDEApplication::desktop()->primaryScreen(); @@ -524,7 +524,7 @@ void DesktopPathConfig::save() else { appname.sprintf("kdesktop-screen-%d", konq_screen_number); } - kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type ) @@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt m_copyToDest = dest; m_copyFromSrc = src; TDEIO::ListJob* job = TDEIO::listDir( src ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) ); tqApp->enter_loop(); if (m_ok) @@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt else { TDEIO::Job * job = TDEIO::move( src, dest ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // wait for job tqApp->enter_loop(); } @@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList } TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest ); - connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); tqApp->enter_loop(); } tqApp->exit_loop(); diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 1f38faabd..c6645bdb8 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -35,7 +35,7 @@ namespace TDEIO { class Job; } class DesktopPathConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 30272c3f6..d06ef054f 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -18,7 +18,7 @@ #include <tdelocale.h> #include <knuminput.h> -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY #include <X11/Xlib.h> #endif @@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg int r = 0; int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons - TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this ); + TQGroupBox* gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Font Si&ze"), this ); lay->addMultiCellWidget(gb, r, r, E, W); TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") ); @@ -48,16 +48,16 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg m_minSize = new KIntNumInput( fMinSize, gb ); m_minSize->setLabel( i18n( "M&inimum font size:" ) ); m_minSize->setRange( 2, 30 ); - connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) ); - connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotMinimumFontSize( int ) ) ); + connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) ); TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than " "this size,<br>overriding any other settings" ) ); m_MedSize = new KIntNumInput( m_minSize, fSize, gb ); m_MedSize->setLabel( i18n( "&Medium font size:" ) ); m_MedSize->setRange( 2, 30 ); - connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) ); - connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotFontSize( int ) ) ); + connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) ); TQWhatsThis::add( m_MedSize, i18n("This is the relative font size Konqueror uses " "to display web sites.") ); @@ -76,14 +76,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[0], wtstr ); - connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pFonts[0]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "&Fixed font:"), this ); lay->addWidget( label, ++r, E ); @@ -97,14 +97,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[1], wtstr ); - connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFixedFont(const TQString&) ) ); - connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFixedFont(const TQString&) ) ); - connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pFonts[1]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "S&erif font:" ), this ); lay->addWidget( label, ++r, E ); @@ -118,14 +118,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[2], wtstr ); - connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotSerifFont( const TQString& ) ) ); - connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotSerifFont(const TQString&) ) ); - connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotSerifFont( const TQString& ) ) ); + connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[2]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotSerifFont(const TQString&) ) ); + connect( m_pFonts[2], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Sa&ns serif font:" ), this ); lay->addWidget( label, ++r, E ); @@ -139,14 +139,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[3], wtstr ); - connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotSansSerifFont( const TQString& ) ) ); - connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotSansSerifFont(const TQString&) ) ); - connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotSansSerifFont( const TQString& ) ) ); + connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[3]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotSansSerifFont(const TQString&) ) ); + connect( m_pFonts[3], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "C&ursive font:" ), this ); @@ -161,14 +161,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[4], wtstr ); - connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotCursiveFont( const TQString& ) ) ); - connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotCursiveFont(const TQString&) ) ); - connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotCursiveFont( const TQString& ) ) ); + connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[4]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotCursiveFont(const TQString&) ) ); + connect( m_pFonts[4], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Fantas&y font:" ), this ); @@ -183,14 +183,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[5], wtstr ); - connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFantasyFont( const TQString& ) ) ); - connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFantasyFont(const TQString&) ) ); - connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFantasyFont( const TQString& ) ) ); + connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[5]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFantasyFont(const TQString&) ) ); + connect( m_pFonts[5], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this ); @@ -200,10 +200,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label->setBuddy( m_pFontSizeAdjust ); lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W ); - connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotFontSizeAdjust( int ) ) ); - connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( changed() ) ); + connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotFontSizeAdjust( int ) ) ); + connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( changed() ) ); label = new TQLabel( i18n( "Default encoding:"), this ); //++r; @@ -222,10 +222,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pEncoding, wtstr ); - connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), - TQT_SLOT( slotEncoding(const TQString&) ) ); - connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), - TQT_SLOT( changed() ) ); + connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ), + TQ_SLOT( slotEncoding(const TQString&) ) ); + connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ), + TQ_SLOT( changed() ) ); ++r; lay->setRowStretch(r, 8); @@ -408,9 +408,9 @@ void KAppearanceOptions::save() m_pConfig->sync(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); emit changed(false); } diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index 46045479e..82f020bda 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -20,7 +20,7 @@ class TDEFontCombo; class KAppearanceOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KAppearanceOptions(); diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index fcddac791..53433264f 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -35,44 +35,44 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title, TQWidget *parent,const char *name) : TQGroupBox(title, parent, name), config(config) { - setColumnLayout(0, Qt::Vertical); + setColumnLayout(0, TQt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout* thisLayout = new TQGridLayout(layout()); - thisLayout->setAlignment(Qt::AlignTop); + thisLayout->setAlignment(TQt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); domainSpecificLV = new TDEListView(this); domainSpecificLV->addColumn(i18n("Host/Domain")); domainSpecificLV->addColumn(i18n("Policy"), 100); - connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed())); - connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed())); - connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton())); - connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton())); + connect(domainSpecificLV,TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(changePressed())); + connect(domainSpecificLV,TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(changePressed())); + connect(domainSpecificLV, TQ_SIGNAL( executed( TQListViewItem *)), TQ_SLOT( updateButton())); + connect(domainSpecificLV, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButton())); thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0); addDomainPB = new TQPushButton(i18n("&New..."), this); thisLayout->addWidget(addDomainPB, 0, 1); - connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed())); + connect(addDomainPB, TQ_SIGNAL(clicked()), TQ_SLOT(addPressed())); changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this); thisLayout->addWidget(changeDomainPB, 1, 1); - connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed())); + connect(changeDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(changePressed())); deleteDomainPB = new TQPushButton(i18n("De&lete"), this); thisLayout->addWidget(deleteDomainPB, 2, 1); - connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed())); + connect(deleteDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(deletePressed())); importDomainPB = new TQPushButton(i18n("&Import..."), this); thisLayout->addWidget(importDomainPB, 3, 1); - connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed())); + connect(importDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(importPressed())); importDomainPB->setEnabled(false); importDomainPB->hide(); exportDomainPB = new TQPushButton(i18n("&Export..."), this); thisLayout->addWidget(exportDomainPB, 4, 1); - connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed())); + connect(exportDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(exportPressed())); exportDomainPB->setEnabled(false); exportDomainPB->hide(); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index f5844071e..2cf3da3d8 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -52,7 +52,7 @@ class PolicyDialog; * @author Leo Savernik */ class DomainListView : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: /** Enumerates the available buttons. */ diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 9a2ae9efe..9b7f520ec 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -55,7 +55,7 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group, mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this); topLayout->addWidget( mKillCheck ); - TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this ); + TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("URL Expressions to Filter"), this ); topLayout->addWidget( topBox ); mListBox = new TQListBox( topBox ); @@ -67,20 +67,20 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group, buttonBox->setSpacing( KDialog::spacingHint() ); mInsertButton = new TQPushButton( i18n("Insert"), buttonBox ); - connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) ); + connect( mInsertButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertFilter() ) ); mUpdateButton = new TQPushButton( i18n("Update"), buttonBox ); - connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) ); + connect( mUpdateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateFilter() ) ); mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeFilter() ) ); mImportButton = new TQPushButton(i18n("Import..."),buttonBox); - connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) ); + connect( mImportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( importFilters() ) ); mExportButton = new TQPushButton(i18n("Export..."),buttonBox); - connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) ); + connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportFilters() ) ); - connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked())); - connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked())); - connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected())); + connect( mEnableCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEnableChecked())); + connect( mKillCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotKillChecked())); + connect( mListBox, TQ_SIGNAL( selectionChanged ()),this, TQ_SLOT( slotItemSelected())); /* * Whats this items diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h index eba3dad7d..3ca2b863b 100644 --- a/kcontrol/konqhtml/filteropts.h +++ b/kcontrol/konqhtml/filteropts.h @@ -30,7 +30,7 @@ class TDEConfig; class KCMFilter : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); ~KCMFilter(); diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index ed87ea349..5b5af6555 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -51,12 +51,12 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks); TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to" " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) ); - connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAdvancedAddBookmarkCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks); TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those" " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) ); - connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pOnlyMarkedBookmarksCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 ); row++; @@ -67,14 +67,14 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable com&pletion of forms" ), bgForm); TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember" " the data you enter in web forms and suggest it in similar fields for all forms." ) ); - connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pFormCompletionCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pMaxFormCompletionItems = new KIntNumInput( bgForm ); m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) ); m_pMaxFormCompletionItems->setRange( 0, 100 ); TQWhatsThis::add( m_pMaxFormCompletionItems, i18n( "Here you can select how many values Konqueror will remember for a form field." ) ); - connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(m_pMaxFormCompletionItems, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgForm, row, row, 0, 1 ); row++; @@ -86,19 +86,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); - connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_cbCursor, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse ); TQWhatsThis::add( m_pOpenMiddleClick, i18n ( "If this box is checked, you can open the URL in the selection by middle clicking on a " "Konqueror view." ) ); - connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pOpenMiddleClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse ); TQWhatsThis::add( m_pBackRightClick, i18n( "If this box is checked, you can go back in history by right clicking on a Konqueror view. " "To access the context menu, press the right mouse button and move." ) ); - connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pBackRightClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgMouse, row, row, 0, 1 ); row++; @@ -107,26 +107,26 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this ); TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAutoLoadImagesCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 ); row++; m_pEnableFavIconCheckBox = new TQCheckBox( i18n( "Enable &favicons"), this ); TQWhatsThis::add( m_pEnableFavIconCheckBox, i18n( "If this box is checked, Konqueror will automatically load and display favicon images that are associated with a web page. These images appear in the Location bar. Otherwise a generic image will appear." ) ); - connect(m_pEnableFavIconCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pEnableFavIconCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pEnableFavIconCheckBox, row, row, 0, 1 ); row++; m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this ); TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pUnfinishedImageFrameCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 ); row++; m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this ); TQWhatsThis::add( m_pAutoRedirectCheckBox, i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) ); - connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAutoRedirectCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 ); row++; @@ -153,7 +153,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "</ul><br><i>Note: The site's CSS definitions can override this value</i>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pUnderlineCombo, whatsThis); - connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pUnderlineCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); @@ -172,7 +172,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li></ul>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pAnimationsCombo, whatsThis); - connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pAnimationsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); label = new TQLabel( i18n("Sm&ooth scrolling"), this); m_pSmoothScrollingCombo = new TQComboBox( false, this ); @@ -190,7 +190,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "</ul>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pSmoothScrollingCombo, whatsThis); - connect(m_pSmoothScrollingCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pSmoothScrollingCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); lay->setRowStretch(row, 1); @@ -362,9 +362,9 @@ void KMiscHTMLOptions::save() kdeglobals.sync(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); emit changed(false); } diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index b04690b51..52c5a7e33 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -33,7 +33,7 @@ class KIntNumInput; class KMiscHTMLOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L ); diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 6a702559e..2a0c15069 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -62,15 +62,15 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB ); - connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) ); + connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleJavaControls() ) ); /*************************************************************************** ***************** Domain Specific Settings ******************************** **************************************************************************/ domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged())); toplevel->addWidget( domainSpecific, 2 ); /*************************************************************************** @@ -84,37 +84,37 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes ); grid->addWidget( javaSecurityManagerCB, 0, 0 ); - connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); + connect( javaSecurityManagerCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes ); grid->addWidget( useKioCB, 0, 1 ); - connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); + connect( useKioCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes ); grid->addWidget( enableShutdownCB, 1, 0 ); - connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); - connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) ); + connect( enableShutdownCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); + connect( enableShutdownCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleJavaControls()) ); TQHBox* secondsHB = new TQHBox( javartGB ); serverTimeoutSB = new KIntNumInput( secondsHB ); serverTimeoutSB->setRange( 0, 1000, 5 ); serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft ); serverTimeoutSB->setSuffix(i18n(" sec")); - connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); + connect(serverTimeoutSB, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged())); TQHBox* pathHB = new TQHBox( javartGB ); pathHB->setSpacing( 10 ); TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ), pathHB ); pathED = new KURLRequester( pathHB ); - connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); + connect( pathED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) ); pathLA->setBuddy( pathED ); TQHBox* addArgHB = new TQHBox( javartGB ); addArgHB->setSpacing( 10 ); TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB ); addArgED = new TQLineEdit( addArgHB ); - connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); + connect( addArgED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) ); addArgLA->setBuddy( addArgED ); /*************************************************************************** diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index ea854aed3..38039188f 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -63,7 +63,7 @@ public: /** Java-specific enhancements to the domain list view */ class JavaDomainListView : public DomainListView { - Q_OBJECT + TQ_OBJECT public: JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt, TQWidget *parent,const char *name = 0); @@ -86,7 +86,7 @@ private: class KJavaOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index da5af132d..8b3b40f4f 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kurlrequester.h> -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY #include <X11/Xlib.h> #endif @@ -45,28 +45,28 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 ); // the global checkbox - TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this ); + TQGroupBox* globalGB = new TQGroupBox( 2, TQt::Vertical, i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB ); TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script " "(also known as JavaScript) that can be contained in HTML pages. " "Note that, as with any browser, enabling scripting languages can be a security problem.") ); - connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); - connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) ); + connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); + connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeJSEnabled() ) ); reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB ); TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript " "code is executed.") ); - connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); + connect( reportErrorsCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB ); TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) ); - connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); + connect( jsDebugWindow, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); // the domain-specific listview domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(changed())); toplevel->addWidget( domainSpecific, 2 ); TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular " @@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid js_policies_frame = new JSPoliciesFrame(&js_global_policies, i18n("Global JavaScript Policies"),this); toplevel->addWidget(js_policies_frame); - connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(js_policies_frame, TQ_SIGNAL(changed()), TQ_SLOT(changed())); // Finally do the loading load(); diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h index 000f7f770..361808f39 100644 --- a/kcontrol/konqhtml/jsopts.h +++ b/kcontrol/konqhtml/jsopts.h @@ -33,7 +33,7 @@ class KJavaScriptOptions; /** JavaScript-specific enhancements to the domain list view */ class JSDomainListView : public DomainListView { - Q_OBJECT + TQ_OBJECT public: JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt, TQWidget *parent,const char *name = 0); @@ -56,7 +56,7 @@ private: class KJavaScriptOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 1debc0ace..c24cd356e 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -132,11 +132,11 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, bool is_per_domain = !policies->isGlobal(); - setColumnLayout(0, Qt::Vertical); + setColumnLayout(0, TQt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); - this_layout->setAlignment(Qt::AlignTop); + this_layout->setAlignment(TQt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); @@ -197,7 +197,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "window.open()</i> for proper operation. Use " "this feature carefully."); TQWhatsThis::add(label, wtstr); - connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int))); + connect(js_popup, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowOpenPolicy(int))); // === window.resizeBy/resizeTo ================================ colIdx = 0; @@ -235,7 +235,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int))); + connect(js_resize, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowResizePolicy(int))); // === window.moveBy/moveTo ================================ colIdx = 0; @@ -273,7 +273,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int))); + connect(js_move, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowMovePolicy(int))); // === window.focus ================================ colIdx = 0; @@ -314,7 +314,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int))); + connect(js_focus, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowFocusPolicy(int))); // === window.status ================================ colIdx = 0; @@ -354,7 +354,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int))); + connect(js_statusbar, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowStatusPolicy(int))); } JSPoliciesFrame::~JSPoliciesFrame() { diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index 3291dedab..48160bf92 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -202,7 +202,7 @@ private: * @author Leo Savernik */ class JSPoliciesFrame : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: /** * constructor diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index 7272e6e93..68bbcab92 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -17,16 +17,16 @@ KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent, le_languages = new TQLineEdit(this); lay->addWidget( le_languages ); - connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); + connect(le_languages, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); lay->addSpacing(10); lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) ); le_charsets = new TQLineEdit(this); lay->addWidget( le_charsets ); - connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); + connect(le_charsets, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); lay->addStretch(10); diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index d4e17af56..39d1a4b82 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -17,7 +17,7 @@ */ class KHTTPOptions : public TDECModule { -Q_OBJECT +TQ_OBJECT public: KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L); diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index a752a3a88..8ee037a8d 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -44,37 +44,37 @@ extern "C" { - KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) + TDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) { TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name ) + TDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name ) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new userInterConfig(c, "FMSettings", parent, name); @@ -111,11 +111,11 @@ KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name) // ### the groupname is duplicated in KJSParts::save java = new KJavaOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( java, i18n( "&Java" ) ); - connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( java, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( javascript, i18n( "Java&Script" ) ); - connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( javascript, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); } KJSParts::~KJSParts() @@ -149,9 +149,9 @@ void KJSParts::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h index 69a324be8..c84c0e81d 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -35,7 +35,7 @@ class TQTabWidget; class KJSParts : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index f8e1ad10a..412fbe0b8 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -22,8 +22,8 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocio.h> -#include <kstandarddirs.h> +#include <tdeprocio.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "htmlopts.h" @@ -62,13 +62,13 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB ); enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB); - priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB); - connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) ); - connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) ); + priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB); + connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTogglePluginsEnabled() ) ); + connect( enableHTTPOnly, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enableUserDemand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updatePLabel(int) ) ); TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); @@ -80,7 +80,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); + connect(domainSpecPB,TQ_SIGNAL(clicked()),TQ_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, i18n("Domain-Specific Policies"),KDialogBase::Close, @@ -88,7 +88,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg); domainSpecific->setMinimumSize(320,200); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged())); domainSpecificDlg->setMainWidget(domainSpecific); @@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); // setup widgets - connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) ); - connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) ); + connect( m_widget->scanAtStartup, TQ_SIGNAL(clicked()), TQ_SLOT(change()) ); + connect( m_widget->scanButton, TQ_SIGNAL(clicked()), TQ_SLOT(scan()) ); m_changed = false; @@ -230,9 +230,9 @@ void KPluginOptions::save() // instantly TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); /*****************************************************************************/ @@ -291,7 +291,7 @@ void KPluginOptions::scan() save(); } - m_nspluginscan = new KProcIO; + m_nspluginscan = new TDEProcIO; TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan"); if (!scanExe) { kdDebug() << "can't find nspluginviewer" << endl; @@ -312,16 +312,16 @@ void KPluginOptions::scan() // start nspluginscan *m_nspluginscan << scanExe << "--verbose"; kdDebug() << "Running nspluginscan" << endl; - connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)), - this, TQT_SLOT(progress(KProcIO*))); - connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(scanDone())); - connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone())); + connect(m_nspluginscan, TQ_SIGNAL(readReady(TDEProcIO*)), + this, TQ_SLOT(progress(TDEProcIO*))); + connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(scanDone())); + connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone())); m_nspluginscan->start(); } -void KPluginOptions::progress(KProcIO *proc) +void KPluginOptions::progress(TDEProcIO *proc) { TQString line; while(proc->readln(line) > 0) @@ -345,22 +345,22 @@ void KPluginOptions::scanDone() void KPluginOptions::dirInit() { m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder")); - connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew())); - connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove())); - connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp())); - connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) ); - connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change())); + connect( m_widget->dirNew, TQ_SIGNAL(clicked()), TQ_SLOT(dirNew())); + connect( m_widget->dirRemove, TQ_SIGNAL(clicked()), TQ_SLOT(dirRemove())); + connect( m_widget->dirUp, TQ_SIGNAL(clicked()), TQ_SLOT(dirUp())); + connect( m_widget->dirDown, TQ_SIGNAL(clicked()), TQ_SLOT(dirDown()) ); + connect( m_widget->useArtsdsp, TQ_SIGNAL(clicked()),TQ_SLOT(change())); connect( m_widget->dirEdit, - TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(dirEdited(const TQString &)) ); + TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(dirEdited(const TQString &)) ); connect( m_widget->dirList, - TQT_SIGNAL(executed(TQListBoxItem*)), - TQT_SLOT(dirSelect(TQListBoxItem*)) ); + TQ_SIGNAL(executed(TQListBoxItem*)), + TQ_SLOT(dirSelect(TQListBoxItem*)) ); connect( m_widget->dirList, - TQT_SIGNAL(selectionChanged(TQListBoxItem*)), - TQT_SLOT(dirSelect(TQListBoxItem*)) ); + TQ_SIGNAL(selectionChanged(TQListBoxItem*)), + TQ_SLOT(dirSelect(TQListBoxItem*)) ); } @@ -555,7 +555,7 @@ void KPluginOptions::pluginLoad( TDEConfig* /*config*/ ) continue; } - TQStringList desc = TQStringList::split(':', line, TRUE); + TQStringList desc = TQStringList::split(':', line, true); TQString mime = desc[0].stripWhiteSpace(); TQString name = desc[2]; TQString suffixes = desc[1]; @@ -605,7 +605,7 @@ PluginDomainDialog::PluginDomainDialog(TQWidget *parent) : hl->addStretch(10); TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this); - connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose())); + connect(closePB,TQ_SIGNAL(clicked()),TQ_SLOT(slotClose())); hl->addWidget(closePB); thisLayout->addLayout(hl); } diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index efd3e0157..3d87597af 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -28,7 +28,7 @@ class TQProgressDialog; class TQSlider; class KDialogBase; class KPluginOptions; -class KProcIO; +class TDEProcIO; /** policies with plugin-specific constructor */ @@ -53,7 +53,7 @@ public: /** Plugin-specific enhancements to the domain list view */ class PluginDomainListView : public DomainListView { - Q_OBJECT + TQ_OBJECT public: PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt, TQWidget *parent,const char *name = 0); @@ -74,7 +74,7 @@ private: * dialog for embedding a PluginDomainListView widget */ class PluginDomainDialog : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PluginDomainDialog(TQWidget *parent); @@ -92,7 +92,7 @@ private: class KPluginOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); @@ -118,7 +118,7 @@ private: protected slots: - void progress(KProcIO *); + void progress(TDEProcIO *); void updatePLabel(int); void change() { change( true ); }; void change( bool c ) { emit changed(c); m_changed = c; }; @@ -130,7 +130,7 @@ private: NSConfigWidget *m_widget; bool m_changed; TQProgressDialog *m_progress; - KProcIO* m_nspluginscan; + TDEProcIO* m_nspluginscan; TQSlider *priority; TQLabel *priorityLabel; PluginPolicies global_policies; diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp index 9409023c1..03720f140 100644 --- a/kcontrol/konqhtml/policydlg.cpp +++ b/kcontrol/konqhtml/policydlg.cpp @@ -34,8 +34,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na le_domain = new TQLineEdit(main); l->setBuddy( le_domain ); grid->addWidget(le_domain, 0, 1); - connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotTextChanged( const TQString &))); + connect( le_domain,TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotTextChanged( const TQString &))); TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) " "or a domain, starting with a dot (like .trinitydesktop.org or .org)") ); diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h index e4a176fb3..0ae66a56e 100644 --- a/kcontrol/konqhtml/policydlg.h +++ b/kcontrol/konqhtml/policydlg.h @@ -31,7 +31,7 @@ class Policies; */ class PolicyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kcontrol/konqhtml/userInterConfig.cpp b/kcontrol/konqhtml/userInterConfig.cpp index 4e18c6d38..d63512590 100644 --- a/kcontrol/konqhtml/userInterConfig.cpp +++ b/kcontrol/konqhtml/userInterConfig.cpp @@ -36,11 +36,11 @@ userInterConfig::userInterConfig(TDEConfig *config, TQString groupName, layout->addWidget(m_widget); layout->addStretch(); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void userInterConfig::notChanged() @@ -68,5 +68,5 @@ void userInterConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } diff --git a/kcontrol/konqhtml/userInterConfig.h b/kcontrol/konqhtml/userInterConfig.h index b87879e45..a019eb7c5 100644 --- a/kcontrol/konqhtml/userInterConfig.h +++ b/kcontrol/konqhtml/userInterConfig.h @@ -24,7 +24,7 @@ class userInterOpts; class userInterConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: userInterConfig(TDEConfig *config, TQString group, diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp index efe3c7343..f61f16488 100644 --- a/kcontrol/konqhtml/userInterOpts_impl.cpp +++ b/kcontrol/konqhtml/userInterOpts_impl.cpp @@ -39,17 +39,17 @@ userInterOpts::userInterOpts(TDEConfig *config, TQString groupName, : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName) { // connections - connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(m_pShowMMBInTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pDynamicTabbarHide, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pDynamicTabbarCycle, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pNewTabsInBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pOpenAfterCurrentPage, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pTabConfirm, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pPermanentCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pHoverCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pKonquerorTabforExternalURL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pPopupsWithinTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pTabCloseActivatePrevious, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); } void userInterOpts::load() @@ -104,9 +104,9 @@ void userInterOpts::save() else m_pConfig->writeEntry( "MultipleTabConfirm", true ); TQByteArray data; - if ( !TDEApplication::kApplication()->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); if ( m_pPermanentCloseButton->isChecked() ) m_pHoverCloseButton->setEnabled(false); diff --git a/kcontrol/konqhtml/userInterOpts_impl.h b/kcontrol/konqhtml/userInterOpts_impl.h index 763b640b9..bfd845abd 100644 --- a/kcontrol/konqhtml/userInterOpts_impl.h +++ b/kcontrol/konqhtml/userInterOpts_impl.h @@ -24,7 +24,7 @@ class userInterOpts : public userInterOptsBase { - Q_OBJECT + TQ_OBJECT public: userInterOpts(TDEConfig *config, TQString groupName, diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 7dfb77dae..28cec6825 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -60,28 +60,28 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org"); setAboutData( ab ); - connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); - connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->realTransparency,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); - connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() )); - connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); - connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); - connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)), - dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &))); - connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList())); + connect(dialog->terminalSizeHintCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->warnCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->ctrldragCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->cutToBeginningOfLineCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->allowResizeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->bidiCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->xonXoffCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->blinkingCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->frameCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->line_spacingSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); + connect(dialog->matchTabWinTitleCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->tabsCycleWheelCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->menuAcceleratorsCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->metaAsAltModeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->realTransparency,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->silence_secondsSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); + connect(dialog->word_connectorLE,TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() )); + connect(dialog->SessionEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQ_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)), + dialog->SessionEditor1, TQ_SLOT(schemaListChanged(const TQStringList &,const TQStringList &))); + connect(dialog->SessionEditor1, TQ_SIGNAL(getList()), dialog->SchemaEditor1, TQ_SLOT(getList())); } void KCMKonsole::load() @@ -165,7 +165,7 @@ void KCMKonsole::save() emit changed(false); - DCOPClient *dcc = kapp->dcopClient(); + DCOPClient *dcc = tdeApp->dcopClient(); dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); dcc->send("kdesktop", "default", "configure()", TQByteArray()); dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray()); diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h index abdd4cc76..32eb58141 100644 --- a/kcontrol/konsole/kcmkonsole.h +++ b/kcontrol/konsole/kcmkonsole.h @@ -28,7 +28,7 @@ class TQStringList; class KCMKonsole : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0); diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index dfa4dbefe..81fc2adff 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -29,7 +29,7 @@ #include <tqcombobox.h> #include <kdebug.h> #include <tqcheckbox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //#include <errno.h> @@ -75,9 +75,9 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) defaultSchema = ""; spix = new TDESharedPixmap; - connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool))); + connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool))); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); TQByteArray data; @@ -94,29 +94,29 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations - connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect())); - connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); - connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); - connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int))); - connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int))); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); - connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview())); - connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview())); - connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview())); - connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview())); - - connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); - connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); - connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified())); - connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified())); - connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified())); - connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); - connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); - - connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); + connect(imageBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(imageSelect())); + connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent())); + connect(colorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotColorChanged(int))); + connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); + connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updatePreview())); + connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updatePreview())); + connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updatePreview())); + connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updatePreview())); + + connect(titleLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified())); + connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified())); + connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(schemaModified())); + connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(modeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(schemaModified())); + connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(schemaModified())); + connect(transparentCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(boldCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified())); + connect(backgndLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified())); + + connect(defaultSchemaCB, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); removeButton->setEnabled( schemaList->currentItem() ); } @@ -230,7 +230,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) { TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema"); TQStringList::ConstIterator it; - disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaList->clear(); TQListBoxItem* currentItem = 0; @@ -253,7 +253,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) schemaList->sort(); schemaList->setCurrentItem(0); // select the first added item correctly too schemaList->setCurrentItem(currentItem); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaListChanged(); } @@ -528,11 +528,11 @@ void SchemaEditor::readSchema(int num) } if(schMod) { - disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaList->setCurrentItem(oldSchema); querySave(); schemaList->setCurrentItem(num); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schMod=false; } @@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().text(); + color[fi] = tdeApp->palette().active().text(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 1; @@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = kapp->palette().active().base(); + color[fi] = tdeApp->palette().active().base(); transparent[fi] = tr; bold[fi] = bo; type[fi] = 2; diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h index 903cc1436..1dd990795 100644 --- a/kcontrol/konsole/schemaeditor.h +++ b/kcontrol/konsole/schemaeditor.h @@ -32,7 +32,7 @@ class TDESharedPixmap; /** SchemaEditor is the base class of the porject */ class SchemaEditor : public SchemaDialog { - Q_OBJECT + TQ_OBJECT public: /** constructor */ SchemaEditor(TQWidget* parent=0, const char *name=0); diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 290541d12..15e47d657 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -21,7 +21,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdefiledialog.h> @@ -60,20 +60,20 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name) TDEGlobal::iconLoader()->addAppDir( "konsole" ); directoryLine->setMode(KFile::Directory); - connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); - connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); - connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); + connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); + connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent())); - connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); + connect(nameLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(directoryLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(executeLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(termLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); - connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified())); + connect(previewIcon, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(sessionModified())); - connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); - connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); - connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); + connect(fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); + connect(keytabCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); + connect(schemaCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); } SessionEditor::~SessionEditor() @@ -167,7 +167,7 @@ void SessionEditor::loadAllSession(TQString currentFile) TQString name = (*it); - KSimpleConfig* co = new KSimpleConfig(name,true); + TDESimpleConfig* co = new TDESimpleConfig(name,true); co->setDesktopGroup(); TQString sesname = co->readEntry("Name",i18n("Unnamed")); delete co; @@ -187,21 +187,21 @@ void SessionEditor::readSession(int num) { int i,counter; TQString str; - KSimpleConfig* co; + TDESimpleConfig* co; if(sesMod) { - disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); + disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); sessionList->setCurrentItem(oldSession); querySave(); sessionList->setCurrentItem(num); - connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); + connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); sesMod=false; } if( sessionList->item(num) ) { removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () ); - co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true); + co = new TDESimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true); co->setDesktopGroup(); str = co->readEntry("Name"); @@ -328,7 +328,7 @@ void SessionEditor::saveCurrent() if (fullpath[0] != '/') fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; - KSimpleConfig* co = new KSimpleConfig(fullpath); + TDESimpleConfig* co = new TDESimpleConfig(fullpath); co->setDesktopGroup(); co->writeEntry("Type","KonsoleApplication"); co->writeEntry("Name",nameLine->text()); diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h index be85f8505..04b60b3f7 100644 --- a/kcontrol/konsole/sessioneditor.h +++ b/kcontrol/konsole/sessioneditor.h @@ -31,7 +31,7 @@ class SessionEditor : public SessionDialog { - Q_OBJECT + TQ_OBJECT public: SessionEditor(TQWidget* parent=0, const char *name=0); ~SessionEditor(); diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt index 3065d1c6e..176ddd6f5 100644 --- a/kcontrol/krdb/kcs/CMakeLists.txt +++ b/kcontrol/krdb/kcs/CMakeLists.txt @@ -9,15 +9,9 @@ # ################################################# +file( GLOB _color_schemes_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kcsrc ) tde_create_translated_desktop( - SOURCE - AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc - CDE.kcsrc DarkBlue.kcsrc DesertRed.kcsrc DigitalCDE.kcsrc - PaleGray.kcsrc Pumpkin.kcsrc SolarisCDE.kcsrc Storm.kcsrc - Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc - KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc - WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc - BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc + SOURCE ${_color_schemes_files} DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes PO_DIR kcontrol-color-schemes ) diff --git a/kcontrol/krdb/kcs/Different.kcsrc b/kcontrol/krdb/kcs/Different.kcsrc new file mode 100644 index 000000000..a846ee727 --- /dev/null +++ b/kcontrol/krdb/kcs/Different.kcsrc @@ -0,0 +1,22 @@ +[Color Scheme] +Name=Different +activeBackground=178,77,122 +activeBlend=174,178,195 +activeForeground=255,255,255 +activeTitleBtnBg=174,178,195 +alternateBackground=138,142,155 +background=7,191,237 +buttonBackground=255,251,225 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +inactiveBackground=174,178,195 +inactiveBlend=174,178,195 +inactiveForeground=0,0,0 +inactiveTitleBtnBg=174,178,195 +linkColor=0,0,255 +selectBackground=255,251,225 +selectForeground=0,0,0 +visitedLinkColor=255,9,9 +windowBackground=148,220,254 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Human.kcsrc b/kcontrol/krdb/kcs/Human.kcsrc new file mode 100644 index 000000000..a4200f73a --- /dev/null +++ b/kcontrol/krdb/kcs/Human.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Human +activeBackground=204,134,62 +activeBlend=204,134,62 +activeForeground=255,255,255 +activeTitleBtnBg=245,243,240 +alternateBackground=245,242,237 +background=239,235,231 +buttonBackground=225,217,209 +buttonForeground=0,0,0 +contrast=7 +foreground=16,16,16 +frame=239,239,239 +handle=239,239,239 +inactiveBackground=235,231,227 +inactiveBlend=235,231,227 +inactiveForeground=179,175,171 +inactiveFrame=239,239,239 +inactiveHandle=239,239,239 +inactiveTitleBtnBg=179,175,171 +linkColor=0,0,238 +selectBackground=214,114,45 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=82,24,139 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc b/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc new file mode 100644 index 000000000..97616f08f --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Amethyst +activeBackground=153,102,204 +activeBlend=167,116,218 +activeForeground=255,255,255 +activeTitleBtnBg=153,102,204 +alternateBackground=255,240,255 +background=247,216,255 +buttonBackground=242,201,254 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=153,102,204 +handle=153,102,204 +inactiveBackground=255,164,255 +inactiveBlend=251,190,255 +inactiveForeground=128,128,128 +inactiveFrame=255,164,255 +inactiveHandle=255,164,255 +inactiveTitleBtnBg=255,164,255 +linkColor=0,0,192 +selectBackground=153,102,204 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,240,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc b/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc new file mode 100644 index 000000000..29346c2fc --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Aquamarine +activeBackground=127,255,212 +activeBlend=157,255,212 +activeForeground=0,0,0 +activeTitleBtnBg=127,255,212 +alternateBackground=240,255,255 +background=216,255,255 +buttonBackground=201,255,254 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=127,255,212 +handle=127,255,212 +inactiveBackground=159,255,255 +inactiveBlend=187,255,255 +inactiveForeground=128,128,128 +inactiveFrame=159,255,255 +inactiveHandle=159,255,255 +inactiveTitleBtnBg=159,255,255 +linkColor=0,0,192 +selectBackground=127,255,212 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=240,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc b/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc new file mode 100644 index 000000000..60259453a --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Carbon +activeBackground=19,14,10 +activeBlend=33,28,24 +activeForeground=255,255,255 +activeTitleBtnBg=19,14,10 +alternateBackground=252,252,252 +background=236,236,236 +buttonBackground=225,225,225 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=19,14,10 +handle=19,14,10 +inactiveBackground=33,28,24 +inactiveBlend=177,177,177 +inactiveForeground=175,175,175 +inactiveFrame=33,28,24 +inactiveHandle=33,28,24 +inactiveTitleBtnBg=33,28,24 +linkColor=0,0,192 +selectBackground=19,14,10 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=252,252,252 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc b/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc new file mode 100644 index 000000000..ba896ece3 --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Citrin +activeBackground=228,208,10 +activeBlend=246,223,4 +activeForeground=0,0,0 +activeTitleBtnBg=228,208,10 +alternateBackground=255,255,239 +background=255,255,216 +buttonBackground=255,255,216 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=228,208,10 +handle=228,208,10 +inactiveBackground=255,254,144 +inactiveBlend=255,255,238 +inactiveForeground=128,128,128 +inactiveFrame=255,254,144 +inactiveHandle=255,254,144 +inactiveTitleBtnBg=255,254,144 +linkColor=0,0,192 +selectBackground=228,208,10 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,255,239 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc b/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc new file mode 100644 index 000000000..1b0c1a83f --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Emerald +activeBackground=80,200,120 +activeBlend=107,200,120 +activeForeground=255,255,255 +activeTitleBtnBg=80,200,120 +alternateBackground=240,255,240 +background=216,255,216 +buttonBackground=200,254,201 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=80,200,120 +handle=80,200,120 +inactiveBackground=152,255,159 +inactiveBlend=184,255,187 +inactiveForeground=128,128,128 +inactiveFrame=152,255,159 +inactiveHandle=152,255,159 +inactiveTitleBtnBg=152,255,159 +linkColor=0,0,192 +selectBackground=80,200,120 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=240,255,240 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc b/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc new file mode 100644 index 000000000..d3c614b12 --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Ruby +activeBackground=224,17,95 +activeBlend=224,44,95 +activeForeground=255,255,255 +activeTitleBtnBg=224,17,95 +alternateBackground=255,240,240 +background=255,216,216 +buttonBackground=254,199,201 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=224,17,95 +handle=224,17,95 +inactiveBackground=255,159,152 +inactiveBlend=255,187,184 +inactiveForeground=128,128,128 +inactiveFrame=255,159,152 +inactiveHandle=255,159,152 +inactiveTitleBtnBg=255,159,152 +linkColor=0,0,192 +selectBackground=224,17,95 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,240,240 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc b/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc new file mode 100644 index 000000000..2d9adf6b6 --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Sapphire +activeBackground=1,49,180 +activeBlend=31,75,180 +activeForeground=255,255,255 +activeTitleBtnBg=1,49,180 +alternateBackground=240,240,255 +background=216,216,255 +buttonBackground=199,200,253 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=1,49,180 +handle=1,49,180 +inactiveBackground=152,159,255 +inactiveBlend=184,187,255 +inactiveForeground=128,128,128 +inactiveFrame=152,159,255 +inactiveHandle=152,159,255 +inactiveTitleBtnBg=152,159,255 +linkColor=0,0,192 +selectBackground=1,49,180 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=240,240,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc b/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc new file mode 100644 index 000000000..1ebff844b --- /dev/null +++ b/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Jewels - Topaz +activeBackground=147,65,8 +activeBlend=162,78,8 +activeForeground=255,255,255 +activeTitleBtnBg=147,65,8 +alternateBackground=255,249,242 +background=255,241,216 +buttonBackground=253,233,199 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=147,65,8 +handle=147,65,8 +inactiveBackground=255,221,160 +inactiveBlend=255,231,188 +inactiveForeground=128,128,128 +inactiveFrame=255,221,160 +inactiveHandle=255,221,160 +inactiveTitleBtnBg=255,221,160 +linkColor=0,0,192 +selectBackground=147,65,8 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,249,242 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Last.fm.kcsrc b/kcontrol/krdb/kcs/Last.fm.kcsrc new file mode 100644 index 000000000..e1659fd83 --- /dev/null +++ b/kcontrol/krdb/kcs/Last.fm.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Last.fm +activeBackground=210,0,57 +activeBlend=183,0,29 +activeForeground=255,255,255 +activeTitleBtnBg=186,7,38 +alternateBackground=252,250,251 +background=227,230,216 +buttonBackground=219,222,210 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +frame=239,239,239 +handle=239,239,239 +inactiveBackground=145,153,142 +inactiveBlend=136,143,133 +inactiveForeground=255,255,255 +inactiveFrame=239,239,239 +inactiveHandle=239,239,239 +inactiveTitleBtnBg=145,153,142 +linkColor=0,0,238 +selectBackground=210,0,57 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=82,24,139 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Lila.kcsrc b/kcontrol/krdb/kcs/Lila.kcsrc new file mode 100644 index 000000000..c5cf64159 --- /dev/null +++ b/kcontrol/krdb/kcs/Lila.kcsrc @@ -0,0 +1,26 @@ +[Color Scheme] +Name=Lila +activeBackground=70,53,124 +activeBlend=221,218,236 +activeForeground=160,160,208 +activeTitleBtnBg=220,220,220 +alternateBackground=221,221,255 +background=236,230,238 +buttonBackground=209,205,221 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +frame=236,230,238 +handle=236,230,238 +inactiveBackground=160,160,208 +inactiveBlend=70,53,124 +inactiveForeground=184,184,184 +inactiveFrame=236,230,238 +inactiveHandle=236,230,238 +inactiveTitleBtnBg=220,220,220 +linkColor=0,0,192 +selectBackground=122,90,218 +selectForeground=255,255,255 +visitedLinkColor=128,0,128 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Lizard.kcsrc b/kcontrol/krdb/kcs/Lizard.kcsrc new file mode 100644 index 000000000..aa77312db --- /dev/null +++ b/kcontrol/krdb/kcs/Lizard.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Lizard +activeBackground=130,209,34 +activeBlend=97,176,0 +activeForeground=255,255,255 +activeTitleBtnBg=156,250,41 +alternateBackground=241,249,237 +background=239,239,239 +buttonBackground=221,223,228 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +frame=239,239,239 +handle=239,239,239 +inactiveBackground=170,209,122 +inactiveBlend=131,169,84 +inactiveForeground=0,0,0 +inactiveFrame=239,239,239 +inactiveHandle=239,239,239 +inactiveTitleBtnBg=167,181,199 +linkColor=0,0,238 +selectBackground=180,250,95 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=82,24,139 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Makefile.am b/kcontrol/krdb/kcs/Makefile.am index dfa2389cf..adf68f19e 100644 --- a/kcontrol/krdb/kcs/Makefile.am +++ b/kcontrol/krdb/kcs/Makefile.am @@ -5,7 +5,11 @@ tdedisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc \ KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc \ WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc \ - BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc + BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc \ + Different.kcsrc Lila.kcsrc Pinkie.kcsrc \ + Jewels-Amethyst.kcsrc Jewels-Aquamarine.kcsrc Jewels-Carbon.kcsrc Jewels-Citrin.kcsrc \ + Jewels-Emerald.kcsrc Jewels-Ruby.kcsrc Jewels-Sapphire.kcsrc Jewels-Topaz.kcsrc \ + Seasons-Autumn.kcsrc Seasons-Spring.kcsrc Seasons-Summer.kcsrc Seasons-Winter.kcsrc tdedisplay_colorschemes_datadir = $(kde_datadir)/tdedisplay/color-schemes diff --git a/kcontrol/krdb/kcs/Pinkie.kcsrc b/kcontrol/krdb/kcs/Pinkie.kcsrc new file mode 100644 index 000000000..ac1f0cea4 --- /dev/null +++ b/kcontrol/krdb/kcs/Pinkie.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Pinkie +activeBackground=255,134,209 +activeBlend=255,184,235 +activeForeground=255,255,255 +activeTitleBtnBg=220,220,220 +alternateBackground=251,224,221 +background=254,224,250 +buttonBackground=248,209,233 +buttonForeground=0,0,0 +contrast=1 +foreground=0,0,0 +frame=255,235,237 +handle=255,235,237 +inactiveBackground=133,67,114 +inactiveBlend=210,118,158 +inactiveForeground=236,237,231 +inactiveFrame=255,235,237 +inactiveHandle=255,235,237 +inactiveTitleBtnBg=220,220,220 +linkColor=0,0,192 +selectBackground=255,174,228 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,230,245 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Platinum.kcsrc b/kcontrol/krdb/kcs/Platinum.kcsrc new file mode 100644 index 000000000..a2e059535 --- /dev/null +++ b/kcontrol/krdb/kcs/Platinum.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Platinum +activeBackground=212,212,212 +activeBlend=136,136,136 +activeForeground=0,0,0 +activeTitleBtnBg=212,212,212 +alternateBackground=242,242,255 +background=241,241,241 +buttonBackground=212,212,212 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +frame=239,239,239 +handle=239,239,239 +inactiveBackground=136,136,136 +inactiveBlend=212,212,212 +inactiveForeground=0,0,0 +inactiveFrame=239,239,239 +inactiveHandle=239,239,239 +inactiveTitleBtnBg=212,212,212 +linkColor=0,0,238 +selectBackground=170,170,214 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=82,24,139 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc b/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc new file mode 100644 index 000000000..6e318b278 --- /dev/null +++ b/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Seasons - Autumn +activeBackground=175,95,55 +activeBlend=205,125,55 +activeForeground=255,255,255 +activeTitleBtnBg=175,95,55 +alternateBackground=255,250,245 +background=240,230,210 +buttonBackground=235,222,198 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=175,95,55 +handle=175,95,55 +inactiveBackground=235,205,125 +inactiveBlend=240,230,210 +inactiveForeground=175,175,175 +inactiveFrame=235,205,125 +inactiveHandle=235,205,125 +inactiveTitleBtnBg=235,205,125 +linkColor=0,0,192 +selectBackground=175,95,55 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,250,245 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Seasons-Spring.kcsrc b/kcontrol/krdb/kcs/Seasons-Spring.kcsrc new file mode 100644 index 000000000..b99558a71 --- /dev/null +++ b/kcontrol/krdb/kcs/Seasons-Spring.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Seasons - Spring +activeBackground=90,180,60 +activeBlend=139,203,105 +activeForeground=255,255,255 +activeTitleBtnBg=90,180,60 +alternateBackground=245,250,245 +background=225,235,225 +buttonBackground=215,229,214 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=90,180,60 +handle=90,180,60 +inactiveBackground=205,235,175 +inactiveBlend=225,235,225 +inactiveForeground=175,175,175 +inactiveFrame=205,235,175 +inactiveHandle=205,235,175 +inactiveTitleBtnBg=205,235,175 +linkColor=0,0,192 +selectBackground=90,180,60 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=245,250,245 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Seasons-Summer.kcsrc b/kcontrol/krdb/kcs/Seasons-Summer.kcsrc new file mode 100644 index 000000000..edb4d8243 --- /dev/null +++ b/kcontrol/krdb/kcs/Seasons-Summer.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Seasons - Summer +activeBackground=0,155,255 +activeBlend=49,178,255 +activeForeground=255,255,255 +activeTitleBtnBg=0,155,255 +alternateBackground=245,250,255 +background=235,245,255 +buttonBackground=217,236,255 +buttonForeground=0,0,0 +contrast=5 +foreground=0,0,0 +frame=0,155,255 +handle=0,155,255 +inactiveBackground=165,225,255 +inactiveBlend=235,245,255 +inactiveForeground=175,175,175 +inactiveFrame=165,225,255 +inactiveHandle=165,225,255 +inactiveTitleBtnBg=165,225,255 +linkColor=0,0,192 +selectBackground=0,155,255 +selectForeground=255,255,255 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=245,250,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/Seasons-Winter.kcsrc b/kcontrol/krdb/kcs/Seasons-Winter.kcsrc new file mode 100644 index 000000000..eefb59f46 --- /dev/null +++ b/kcontrol/krdb/kcs/Seasons-Winter.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Seasons - Winter +activeBackground=193,202,216 +activeBlend=207,216,230 +activeForeground=82,82,82 +activeTitleBtnBg=193,202,216 +alternateBackground=255,255,255 +background=244,243,242 +buttonBackground=237,235,234 +buttonForeground=82,82,82 +contrast=5 +foreground=82,82,82 +frame=193,202,216 +handle=193,202,216 +inactiveBackground=216,221,228 +inactiveBlend=244,243,242 +inactiveForeground=128,128,128 +inactiveFrame=216,221,228 +inactiveHandle=216,221,228 +inactiveTitleBtnBg=216,221,228 +linkColor=0,0,192 +selectBackground=193,202,216 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=128,0,128 +windowBackground=255,255,255 +windowForeground=82,82,82 diff --git a/kcontrol/krdb/kcs/Sienna.kcsrc b/kcontrol/krdb/kcs/Sienna.kcsrc new file mode 100644 index 000000000..2839500e0 --- /dev/null +++ b/kcontrol/krdb/kcs/Sienna.kcsrc @@ -0,0 +1,27 @@ +[Color Scheme] +Name=Sienna +activeBackground=209,136,34 +activeBlend=176,103,0 +activeForeground=255,255,255 +activeTitleBtnBg=250,163,41 +alternateBackground=249,244,237 +background=239,239,239 +buttonBackground=221,223,228 +buttonForeground=0,0,0 +contrast=7 +foreground=0,0,0 +frame=239,239,239 +handle=239,239,239 +inactiveBackground=209,173,122 +inactiveBlend=169,134,84 +inactiveForeground=0,0,0 +inactiveFrame=239,239,239 +inactiveHandle=239,239,239 +inactiveTitleBtnBg=167,181,199 +linkColor=0,0,238 +selectBackground=250,185,95 +selectForeground=0,0,0 +shadeSortColumn=true +visitedLinkColor=82,24,139 +windowBackground=255,255,255 +windowForeground=0,0,0 diff --git a/kcontrol/krdb/kcs/WedgieWeb.kcsrc b/kcontrol/krdb/kcs/WedgieWeb.kcsrc new file mode 100644 index 000000000..c0fc98663 --- /dev/null +++ b/kcontrol/krdb/kcs/WedgieWeb.kcsrc @@ -0,0 +1,22 @@ +[Color Scheme] +Name=WedgieWeb +activeBackground=68,68,119 +activeBlend=68,68,119 +activeForeground=204,119,34 +activeTitleBtnBg=116,132,115 +alternateBackground=226,234,226 +background=65,68,115 +buttonBackground=49,48,98 +buttonForeground=156,161,164 +contrast=0 +foreground=153,119,0 +inactiveBackground=68,68,119 +inactiveBlend=68,68,119 +inactiveForeground=120,70,20 +inactiveTitleBtnBg=162,184,160 +linkColor=156,161,164 +selectBackground=65,48,49 +selectForeground=204,119,34 +visitedLinkColor=156,161,164 +windowBackground=0,16,32 +windowForeground=153,119,0 diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 25db21f3c..96467679d 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -33,8 +33,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> -#include <kprocio.h> +#include <tdestandarddirs.h> +#include <tdeprocio.h> #include <ksavefile.h> #include <tdetempfile.h> #include <tdelocale.h> @@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); + tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); } // ----------------------------------------------------------------------------- @@ -168,9 +168,9 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings ) TQMap <TQString, bool> pathDb; // OK, this isn't fun at all. - // KApp adds paths ending with /, QApp those without slash, and if + // TDEApp adds paths ending with /, QApp those without slash, and if // one gives it something that is other way around, it will complain and scare - // users. So we need to know whether a path being added is from KApp, and in this case + // users. So we need to know whether a path being added is from TDEApp, and in this case // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = tqVersion(); diff --git a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml index 3d534f9b6..cdeba332c 100644 --- a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml +++ b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#1e1e1e" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_plastik" > + <wm type="builtin" name="twin_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml index 2b648eac4..ea1938388 100644 --- a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml +++ b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#1e1e1e" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_plastik" > + <wm type="builtin" name="twin_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml index a93aba33a..c16988a4c 100644 --- a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml +++ b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#e1e1e1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_plastik" > + <wm type="builtin" name="twin_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml index 602f21613..d52955aaa 100644 --- a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml +++ b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#e1e1e1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_plastik" > + <wm type="builtin" name="twin_plastik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml index 5236e586d..a3b3a524f 100644 --- a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml +++ b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_default" > + <wm type="builtin" name="twin_default" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Keramik/Keramik.xml b/kcontrol/krdb/themes/Keramik/Keramik.xml index bbc117ed6..2553d8a69 100644 --- a/kcontrol/krdb/themes/Keramik/Keramik.xml +++ b/kcontrol/krdb/themes/Keramik/Keramik.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_keramik" > + <wm type="builtin" name="twin_keramik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml index 6de5bee12..7ae86cd7d 100644 --- a/kcontrol/krdb/themes/Plastik/Plastik.xml +++ b/kcontrol/krdb/themes/Plastik/Plastik.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_plastik" > + <wm type="builtin" name="twin_plastik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Platinum/Platinum.xml b/kcontrol/krdb/themes/Platinum/Platinum.xml index 6a439e46d..6b7a843c1 100644 --- a/kcontrol/krdb/themes/Platinum/Platinum.xml +++ b/kcontrol/krdb/themes/Platinum/Platinum.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_system" > + <wm type="builtin" name="twin_system" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Redmond/Redmond.xml b/kcontrol/krdb/themes/Redmond/Redmond.xml index 1371f60e6..097c0001d 100644 --- a/kcontrol/krdb/themes/Redmond/Redmond.xml +++ b/kcontrol/krdb/themes/Redmond/Redmond.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_redmond" > + <wm type="builtin" name="twin_redmond" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Sunshine/Sunshine.xml b/kcontrol/krdb/themes/Sunshine/Sunshine.xml index dfd65fe3f..0f5d20285 100644 --- a/kcontrol/krdb/themes/Sunshine/Sunshine.xml +++ b/kcontrol/krdb/themes/Sunshine/Sunshine.xml @@ -100,7 +100,7 @@ <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_cde" > + <wm type="builtin" name="twin_cde" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml index 3a7332628..e98edd00a 100644 --- a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml +++ b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#1e1ee1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_quartz" > + <wm type="builtin" name="twin_quartz" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml index c624bbb6e..264971d9d 100644 --- a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml +++ b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml @@ -135,7 +135,7 @@ <inactiveHandle rgb="#1e1ee1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="twin3_quartz" > + <wm type="builtin" name="twin_quartz" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp index 76af5490a..220408ab9 100644 --- a/kcontrol/kthememanager/knewthemedlg.cpp +++ b/kcontrol/kthememanager/knewthemedlg.cpp @@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name ) { m_base = new NewThemeWidget( this, "new_theme_base" ); setMainWidget( m_base ); - connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) ); + connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) ); slotThemeNameChanged( m_base->leName->text() ); } diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h index 5580c4d01..39b7d554c 100644 --- a/kcontrol/kthememanager/knewthemedlg.h +++ b/kcontrol/kthememanager/knewthemedlg.h @@ -31,7 +31,7 @@ class NewThemeWidget; */ class KNewThemeDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KNewThemeDlg( TQWidget * parent = 0, const char * name = 0); ~KNewThemeDlg(); diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 1068eb325..4827f1c40 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <kipc.h> #include <tdelocale.h> #include <kservice.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <ktar.h> #include <tdestyle.h> @@ -436,7 +436,7 @@ void KTheme::apply() desktopConf.sync(); // TODO sync and signal only if <desktop> elem present // reconfigure kdesktop. kdesktop will notify all clients - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if ( !client->isAttached() ) { client->attach(); } @@ -535,7 +535,7 @@ void KTheme::apply() TDEConfig * colorConf = TDEGlobal::config(); TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc"); - KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme ); + TDESimpleConfig *colorScheme = new TDESimpleConfig( sCurrentScheme ); colorScheme->setGroup("Color Scheme" ); for ( uint i = 0; i < colorList.count(); i++ ) @@ -657,7 +657,7 @@ void KTheme::apply() if ( !fontsElem.isNull() ) { TDEConfig * fontsConf = TDEGlobal::config(); - TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); + TDEConfig * kde1xConf = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" ); kde1xConf->setGroup( "General" ); TQDomNodeList fontList = fontsElem.childNodes(); diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 717f68e32..8f7fade9d 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -503,7 +503,7 @@ <include location="local" impldecl="in implementation">kthemedlg.ui.h</include> <include location="global" impldecl="in implementation">kurllabel.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">startKonqui( const TQString & url )</slot> <slot specifier="non virtual">startBackground()</slot> <slot specifier="non virtual">startColors()</slot> @@ -511,6 +511,6 @@ <slot specifier="non virtual">startIcons()</slot> <slot specifier="non virtual">startFonts()</slot> <slot specifier="non virtual">startSaver()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 5972efa2b..46dcbd59e 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include "kthememanager.h" @@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name ) dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum ); - connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotInstallTheme() ) ); + connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotInstallTheme() ) ); - connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveTheme() ) ); + connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveTheme() ) ); - connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCreateTheme() ) ); + connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCreateTheme() ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ), - this, TQT_SLOT( updateButton() ) ); + connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ), + this, TQ_SLOT( updateButton() ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( updateButton() ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( updateButton() ) ); m_origTheme = new KTheme( this, true ); // stores the defaults to get back to m_origTheme->setName( ORIGINAL_THEME ); @@ -405,7 +405,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) TQImage preview( pixFile, "PNG" ); if (preview.width()>dlg->lbPreview->contentsRect().width() || preview.height()>dlg->lbPreview->contentsRect().height() ) - preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin ); + preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin ); TQPixmap pix; pix.convertFromImage( preview ); dlg->lbPreview->setPixmap( pix ); @@ -413,7 +413,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) extern "C" { - KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index ac9fa5dc7..2415bd02e 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -60,7 +60,7 @@ private: */ class kthememanager: public TDECModule { - Q_OBJECT + TQ_OBJECT public: kthememanager( TQWidget *parent=0, const char *name=0 ); virtual ~kthememanager(); diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 1b7875e7f..db3461714 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -56,7 +56,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "notification. In this case, the cursor stops blinking after the time\n" "given in the section 'Startup indication timeout'")); - GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->setColumnLayout(0, TQt::Vertical ); GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox1 ); @@ -71,9 +71,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 ); cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 ); GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 ); - connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), - TQT_SLOT ( slotBusyCursor(int))); - connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) ); + connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), + TQ_SLOT ( slotBusyCursor(int))); + connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), TQ_SLOT( checkChanged() ) ); lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" ); lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) ); @@ -83,8 +83,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL sb_cursorTimeout->setSuffix( i18n(" sec") ); GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 ); lbl_cursorTimeout->setBuddy( sb_cursorTimeout ); - connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( checkChanged() ) ); + connect( sb_cursorTimeout, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( checkChanged() ) ); TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" ); GroupBox2->setTitle( i18n( "Taskbar &Notification" ) ); @@ -96,7 +96,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "notification. In this case, the button disappears after the time\n" "given in the section 'Startup indication timeout'")); - GroupBox2->setColumnLayout( 0, Qt::Vertical ); + GroupBox2->setColumnLayout( 0, TQt::Vertical ); GroupBox2->layout()->setSpacing( 0 ); GroupBox2->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox2 ); @@ -108,9 +108,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" ); cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) ); GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 ); - connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotTaskbarButton(bool))); - connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged())); + connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotTaskbarButton(bool))); + connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( checkChanged())); lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" ); lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) ); @@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL sb_taskbarTimeout->setSuffix( i18n(" sec") ); GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 ); lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout ); - connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( checkChanged() ) ); + connect( sb_taskbarTimeout, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( checkChanged() ) ); Form1Layout->addStretch(); @@ -212,11 +212,11 @@ LaunchConfig::save() emit changed( false ); - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); TQByteArray data; - kapp->dcopClient()->send( "kicker", "Panel", "restart()", data ); - kapp->dcopClient()->send( "kdesktop", "", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", data ); + tdeApp->dcopClient()->send( "kdesktop", "", "configure()", data ); } void diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h index e0219ffd3..3781cdd58 100644 --- a/kcontrol/launch/kcmlaunch.h +++ b/kcontrol/launch/kcmlaunch.h @@ -28,7 +28,7 @@ class KIntNumInput; class LaunchConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am index df5b46511..260d2ba94 100644 --- a/kcontrol/locale/Makefile.am +++ b/kcontrol/locale/Makefile.am @@ -1,5 +1,3 @@ -#AM_CPPFLAGS = -DTQT_NO_CAST_ASCII -DTQT_NO_COMPAT - AM_CPPFLAGS = $(all_includes) SUBDIRS = default pics diff --git a/kcontrol/locale/TIMEZONES b/kcontrol/locale/TIMEZONES index a47b45ea6..73a507976 100644 --- a/kcontrol/locale/TIMEZONES +++ b/kcontrol/locale/TIMEZONES @@ -87,7 +87,9 @@ i18n("America/Cayenne"); i18n("America/Cayman"); i18n("America/Chicago"); i18n("America/Chihuahua"); +i18n("America/Ciudad_Juarez"); i18n("America/Costa_Rica"); +i18n("America/Coyhaique"); i18n("America/Creston"); i18n("America/Cuiaba"); i18n("America/Curacao"); @@ -150,7 +152,6 @@ i18n("America/Montevideo"); i18n("America/Montserrat"); i18n("America/Nassau"); i18n("America/New_York"); -i18n("America/Nipigon"); i18n("America/Nome"); i18n("America/Noronha"); i18n("America/North_Dakota/Beulah"); @@ -159,7 +160,6 @@ i18n("America/North_Dakota/New_Salem"); i18n("America/Nuuk"); i18n("America/Ojinaga"); i18n("America/Panama"); -i18n("America/Pangnirtung"); i18n("America/Paramaribo"); i18n("America/Phoenix"); i18n("America/Port-au-Prince"); @@ -167,7 +167,6 @@ i18n("America/Port_of_Spain"); i18n("America/Porto_Velho"); i18n("America/Puerto_Rico"); i18n("America/Punta_Arenas"); -i18n("America/Rainy_River"); i18n("America/Rankin_Inlet"); i18n("America/Recife"); i18n("America/Regina"); @@ -188,7 +187,6 @@ i18n("America/St_Vincent"); i18n("America/Swift_Current"); i18n("America/Tegucigalpa"); i18n("America/Thule"); -i18n("America/Thunder_Bay"); i18n("America/Tijuana"); i18n("America/Toronto"); i18n("America/Tortola"); @@ -196,7 +194,6 @@ i18n("America/Vancouver"); i18n("America/Whitehorse"); i18n("America/Winnipeg"); i18n("America/Yakutat"); -i18n("America/Yellowknife"); i18n("Antarctica/Casey"); i18n("Antarctica/Davis"); i18n("Antarctica/DumontDUrville"); @@ -226,7 +223,6 @@ i18n("Asia/Beirut"); i18n("Asia/Bishkek"); i18n("Asia/Brunei"); i18n("Asia/Chita"); -i18n("Asia/Choibalsan"); i18n("Asia/Colombo"); i18n("Asia/Damascus"); i18n("Asia/Dhaka"); @@ -334,8 +330,8 @@ i18n("Europe/Isle_of_Man"); i18n("Europe/Istanbul"); i18n("Europe/Jersey"); i18n("Europe/Kaliningrad"); -i18n("Europe/Kiev"); i18n("Europe/Kirov"); +i18n("Europe/Kyiv"); i18n("Europe/Lisbon"); i18n("Europe/Ljubljana"); i18n("Europe/London"); @@ -363,7 +359,6 @@ i18n("Europe/Stockholm"); i18n("Europe/Tallinn"); i18n("Europe/Tirane"); i18n("Europe/Ulyanovsk"); -i18n("Europe/Uzhgorod"); i18n("Europe/Vaduz"); i18n("Europe/Vatican"); i18n("Europe/Vienna"); @@ -371,7 +366,6 @@ i18n("Europe/Vilnius"); i18n("Europe/Volgograd"); i18n("Europe/Warsaw"); i18n("Europe/Zagreb"); -i18n("Europe/Zaporozhye"); i18n("Europe/Zurich"); i18n("Indian/Antananarivo"); i18n("Indian/Chagos"); @@ -391,7 +385,6 @@ i18n("Pacific/Chatham"); i18n("Pacific/Chuuk"); i18n("Pacific/Easter"); i18n("Pacific/Efate"); -i18n("Pacific/Enderbury"); i18n("Pacific/Fakaofo"); i18n("Pacific/Fiji"); i18n("Pacific/Funafuti"); @@ -400,6 +393,7 @@ i18n("Pacific/Gambier"); i18n("Pacific/Guadalcanal"); i18n("Pacific/Guam"); i18n("Pacific/Honolulu"); +i18n("Pacific/Kanton"); i18n("Pacific/Kiritimati"); i18n("Pacific/Kosrae"); i18n("Pacific/Kwajalein"); diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 3d1736676..22d815866 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -33,11 +33,11 @@ #include <kdebug.h> #include <kdialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kiconloader.h> #include <klanguagebutton.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "kcmlocale.h" #include "kcmlocale.moc" @@ -55,34 +55,34 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:")); m_comboCountry = new KLanguageButton( this ); m_labCountry->setBuddy(m_comboCountry); - connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(changedCountry(const TQString &)) ); + connect( m_comboCountry, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); - connect(m_languages, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotCheckButtons())); + connect(m_languages, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotCheckButtons())); TQWidget * vb = new TQWidget(this); TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint()); m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language")); boxlay->add(m_addLanguage); - connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotAddLanguage(const TQString &))); + connect(m_addLanguage, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotAddLanguage(const TQString &))); m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language")); m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up")); m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down")); boxlay->add(m_removeLanguage); boxlay->add(m_upButton); boxlay->add(m_downButton); - connect(m_removeLanguage, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveLanguage())); - connect(m_upButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageUp())); - connect(m_downButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageDown())); + connect(m_removeLanguage, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveLanguage())); + connect(m_upButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageUp())); + connect(m_downButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageDown())); boxlay->insertStretch(-1); // #### HPB: This should be implemented for KDE 3 @@ -113,9 +113,9 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, languageSelectorLayout->addStretch(); lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); - connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) ); - connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) ); - connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) ); + connect( installLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallLanguage()) ); + connect( uninstallLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectLanguage()) ); #endif } @@ -126,8 +126,8 @@ void TDELocaleConfig::slotInstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode install"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -138,8 +138,8 @@ void TDELocaleConfig::slotUninstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode uninstall"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -150,8 +150,8 @@ void TDELocaleConfig::slotSelectLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode select"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -299,7 +299,7 @@ void TDELocaleConfig::loadLanguageList() menu_index = -2; // first entries should _not_ be sorted continue; } - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -346,7 +346,7 @@ void TDELocaleConfig::loadCountryList() if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -367,7 +367,7 @@ void TDELocaleConfig::loadCountryList() for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -403,7 +403,7 @@ void TDELocaleConfig::readLocale(const TQString &path, TQString &name, .arg(sub) .arg(path); - KSimpleConfig entry(locate("locale", filepath)); + TDESimpleConfig entry(locate("locale", filepath)); entry.setGroup("KCM Locale"); name = entry.readEntry("Name"); @@ -505,7 +505,7 @@ TQStringList TDELocaleConfig::languageList() const TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); - KSimpleConfig entry(fileName); + TDESimpleConfig entry(fileName); entry.setGroup("KCM Locale"); return entry.readListEntry("Languages"); diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index c8b126919..e4b7e24cd 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -40,7 +40,7 @@ class TQPushButton; class TDELocaleConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleConfig( TDELocale *_locale, diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index 9903965e8..487a3455e 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -42,11 +42,11 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale, m_locale(locale) { TQGridLayout *lay = new TQGridLayout(this, 5, 2); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); // Whatever the color scheme is, we want black text TQColorGroup a = palette().active(); - a.setColor(TQColorGroup::Foreground, Qt::black); + a.setColor(TQColorGroup::Foreground, TQt::black); TQPalette pal(a, a, a); m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:")); @@ -78,7 +78,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale, lay->setColStretch(1, 3); TQTimer *timer = new TQTimer(this, "clock_timer"); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTime())); timer->start(1000); } @@ -90,9 +90,9 @@ void TDELocaleSample::slotUpdateTime() { TQDateTime dt = TQDateTime::currentDateTime(); - m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)); - m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true)); - m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true)); + m_dateSample->setText(m_locale->formatDate(dt.date(), false)); + m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); + m_timeSample->setText(m_locale->formatTime(dt.time(), true)); } void TDELocaleSample::slotLocaleChanged() diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h index f4233c3cf..751f9f8f2 100644 --- a/kcontrol/locale/klocalesample.h +++ b/kcontrol/locale/klocalesample.h @@ -34,7 +34,7 @@ class TDELocale; class TDELocaleSample : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleSample(TDELocale *_locale, TQWidget *parent = 0, const char*name = 0); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 609e0c9ad..cd3780067 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -34,8 +34,8 @@ #include <knuminput.h> #include <kdialog.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "toplevel.h" #include "localemon.h" @@ -55,22 +55,22 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale, lay->addWidget(m_labMonCurSym, 0, 0); m_edMonCurSym = new TQLineEdit(this); lay->addWidget(m_edMonCurSym, 0, 1); - connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonCurSymChanged(const TQString &) ) ); + connect( m_edMonCurSym, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonCurSymChanged(const TQString &) ) ); m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:")); lay->addWidget(m_labMonDecSym, 1, 0); m_edMonDecSym = new TQLineEdit(this); lay->addWidget(m_edMonDecSym, 1, 1); - connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonDecSymChanged(const TQString &) ) ); + connect( m_edMonDecSym, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonDecSymChanged(const TQString &) ) ); m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:")); lay->addWidget(m_labMonThoSep, 2, 0); m_edMonThoSep = new TQLineEdit(this); lay->addWidget(m_edMonThoSep, 2, 1); - connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonThoSepChanged(const TQString &) ) ); + connect( m_edMonThoSep, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonThoSepChanged(const TQString &) ) ); m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:")); lay->addWidget(m_labMonFraDig, 3, 0); @@ -78,34 +78,34 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale, m_inMonFraDig->setRange(0, 10, 1, false); lay->addWidget(m_inMonFraDig, 3, 1); - connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotMonFraDigChanged(int) ) ); + connect( m_inMonFraDig, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotMonFraDigChanged(int) ) ); TQWidget *vbox = new TQVBox(this); lay->addMultiCellWidget(vbox, 4, 4, 0, 1); TQVGroupBox *vgrp; vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") ); m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotMonPosPreCurSymChanged() ) ); + connect( m_chMonPosPreCurSym, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotMonPosPreCurSymChanged() ) ); TQHBox *hbox; hbox = new TQHBox( vgrp ); m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos"); - connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMonPosMonSignPosChanged(int) ) ); + connect( m_cmbMonPosMonSignPos, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMonPosMonSignPosChanged(int) ) ); vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") ); m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotMonNegPreCurSymChanged() ) ); + connect( m_chMonNegPreCurSym, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotMonNegPreCurSymChanged() ) ); hbox = new TQHBox( vgrp ); m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos"); - connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMonNegMonSignPosChanged(int) ) ); + connect( m_cmbMonNegMonSignPos, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMonNegMonSignPosChanged(int) ) ); // insert some items int i = 5; @@ -130,7 +130,7 @@ void TDELocaleConfigMoney::save() TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig ent(locate("locale", + TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -260,8 +260,8 @@ void TDELocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void TDELocaleConfigMoney::slotTranslate() { TQObjectList list; - list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos)); - list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos)); + list.append(m_cmbMonPosMonSignPos); + list.append(m_cmbMonNegMonSignPos); TQComboBox *wc; for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h index d84db0e37..28d1f8f91 100644 --- a/kcontrol/locale/localemon.h +++ b/kcontrol/locale/localemon.h @@ -37,7 +37,7 @@ class KLanguageCombo; class TDELocaleConfigMoney : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleConfigMoney(TDELocale *locale, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index ca523d2e9..0079edbd1 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -28,8 +28,8 @@ #include <tqregexp.h> #include <kdialog.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "toplevel.h" #include "localenum.h" @@ -43,36 +43,36 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale, TQGridLayout *lay = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:")); m_edDecSym = new TQLineEdit(this); - connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDecSymChanged(const TQString &) ) ); + connect( m_edDecSym, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDecSymChanged(const TQString &) ) ); m_labDecSym->setBuddy(m_edDecSym); m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:")); m_edThoSep = new TQLineEdit(this); - connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotThoSepChanged(const TQString &) ) ); + connect( m_edThoSep, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotThoSepChanged(const TQString &) ) ); m_labThoSep->setBuddy(m_edThoSep); m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:")); m_edMonPosSign = new TQLineEdit(this); - connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) ); + connect( m_edMonPosSign, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotMonPosSignChanged(const TQString &) ) ); m_labMonPosSign->setBuddy(m_edMonPosSign); m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:")); m_edMonNegSign = new TQLineEdit(this); - connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) ); + connect( m_edMonNegSign, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotMonNegSignChanged(const TQString &) ) ); m_labMonNegSign->setBuddy(m_edMonNegSign); lay->setColStretch(1, 1); - connect(this, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotLocaleChanged())); } TDELocaleConfigNumber::~TDELocaleConfigNumber() @@ -88,7 +88,7 @@ void TDELocaleConfigNumber::save() TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig ent(locate("locale", + TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h index 1e19b687f..6441821ce 100644 --- a/kcontrol/locale/localenum.h +++ b/kcontrol/locale/localenum.h @@ -36,7 +36,7 @@ class KLanguageCombo; class TDELocaleConfigNumber : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleConfigNumber( TDELocale *_locale, diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 6cb8e9a8d..509b22c7f 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -28,8 +28,8 @@ #include <kdialog.h> #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "localeother.h" #include "localeother.moc" @@ -49,15 +49,15 @@ TDELocaleConfigOther::TDELocaleConfigOther(TDELocale *locale, lay->addWidget(m_labPageSize, 0, 0); m_combPageSize = new TQComboBox(this); lay->addWidget(m_combPageSize, 0, 1); - connect( m_combPageSize, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotPageSizeChanged(int) ) ); + connect( m_combPageSize, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotPageSizeChanged(int) ) ); m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:")); lay->addWidget(m_labMeasureSystem, 1, 0); m_combMeasureSystem = new TQComboBox(this); lay->addWidget(m_combMeasureSystem, 1, 1); - connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMeasureSystemChanged(int) ) ); + connect( m_combMeasureSystem, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMeasureSystemChanged(int) ) ); m_combPageSize->insertItem(TQString::null); m_combPageSize->insertItem(TQString::null); @@ -79,7 +79,7 @@ void TDELocaleConfigOther::save() TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig ent(locate("locale", + TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h index 1ccad292d..68b8964b3 100644 --- a/kcontrol/locale/localeother.h +++ b/kcontrol/locale/localeother.h @@ -33,7 +33,7 @@ class TDELocale; class TDELocaleConfigOther : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleConfigOther(TDELocale *locale, TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 1e31f14f7..4275965d3 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -29,8 +29,8 @@ #include <tqvaluevector.h> #include <kdialog.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kcalendarsystem.h> @@ -198,12 +198,12 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale, TQGridLayout *lay = new TQGridLayout(this, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:")); m_comboCalendarSystem = new TQComboBox(false, this); - connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotCalendarSystemChanged(int))); + connect(m_comboCalendarSystem, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotCalendarSystemChanged(int))); TQStringList tmpCalendars; tmpCalendars << TQString::null << TQString::null; m_comboCalendarSystem->insertStringList(tmpCalendars); @@ -212,29 +212,29 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale, m_comboTimeFmt = new TQComboBox(true, this); //m_edTimeFmt = m_comboTimeFmt->lineEdit(); //m_edTimeFmt = new TQLineEdit(this); - connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) ); + connect( m_comboTimeFmt, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotTimeFmtChanged(const TQString &) ) ); m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:")); m_comboDateFmt = new TQComboBox(true, this); - connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) ); + connect( m_comboDateFmt, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDateFmtChanged(const TQString &) ) ); m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:")); m_comboDateFmtShort = new TQComboBox(true, this); - connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) ); + connect( m_comboDateFmtShort, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDateFmtShortChanged(const TQString &) ) ); m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:")); m_comboWeekStartDay = new TQComboBox(false, this); - connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotWeekStartDayChanged(int))); + connect (m_comboWeekStartDay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotWeekStartDayChanged(int))); updateWeekDayNames(); m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name")); - connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDateMonthNamePossChanged() ) ); + connect( m_chDateMonthNamePossessive, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDateMonthNamePossChanged() ) ); lay->setColStretch(1, 1); } @@ -252,7 +252,7 @@ void TDELocaleConfigTime::save() TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig ent(locate("locale", + TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h index 0c34380f7..e44621357 100644 --- a/kcontrol/locale/localetime.h +++ b/kcontrol/locale/localetime.h @@ -38,7 +38,7 @@ class StringPair; class TDELocaleConfigTime : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDELocaleConfigTime( TDELocale *_locale, TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 634c3bd45..8842b3852 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -22,7 +22,7 @@ #include "toplevel.h" extern "C" { - KDE_EXPORT void *init_kcm_locale() { + TDE_EXPORT void *init_kcm_locale() { TDELocale::setMainCatalogue("kcmlocale"); return new TDELocaleFactory("kcmlocale"); } diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index d2a17ca74..525a73953 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kdialog.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservice.h> #include "localenum.h" @@ -64,7 +64,7 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name* m_locale = new TDELocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - l->setAutoAdd(TRUE); + l->setAutoAdd(true); m_tab = new TQTabWidget(this); @@ -84,64 +84,64 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name* m_sample = new TDELocaleSample(m_locale, m_gbox); // getting signals from childs - connect(m_localemain, TQT_SIGNAL(localeChanged()), - this, TQT_SIGNAL(localeChanged())); - connect(m_localemain, TQT_SIGNAL(languageChanged()), - this, TQT_SIGNAL(languageChanged())); + connect(m_localemain, TQ_SIGNAL(localeChanged()), + this, TQ_SIGNAL(localeChanged())); + connect(m_localemain, TQ_SIGNAL(languageChanged()), + this, TQ_SIGNAL(languageChanged())); // run the slots on the childs - connect(this, TQT_SIGNAL(localeChanged()), - m_localemain, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localenum, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localemon, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localetime, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localeother, TQT_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localemain, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localenum, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localemon, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localetime, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localeother, TQ_SLOT(slotLocaleChanged())); // keep the example up to date // NOTE: this will make the sample be updated 6 times the first time // because combo boxes++ emits the change signal not only when the user changes // it, but also when it's changed by the program. - connect(m_localenum, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); - connect(m_localemon, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); - connect(m_localetime, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localenum, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); + connect(m_localemon, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); + connect(m_localetime, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); // No examples for this yet - //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()), - //m_sample, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); + //connect(m_localeother, TQ_SIGNAL(slotLocaleChanged()), + //m_sample, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); // make sure we always have translated interface - connect(this, TQT_SIGNAL(languageChanged()), - this, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localemain, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localenum, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localemon, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localetime, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localeother, TQT_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + this, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localemain, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localenum, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localemon, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localetime, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localeother, TQ_SLOT(slotTranslate())); // mark it as changed when we change it. - connect(m_localemain, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localenum, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localemon, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localetime, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localeother, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); + connect(m_localemain, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localenum, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localemon, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localetime, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localeother, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); load(); } @@ -244,7 +244,7 @@ void TDELocaleApplication::slotTranslate() // The untranslated string for TQLabel are stored in // the name() so we use that when retranslating TQObject *wc; - TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *list = queryList("TQWidget"); TQObjectListIt it(*list); while ( (wc = it.current()) != 0 ) { @@ -260,15 +260,15 @@ void TDELocaleApplication::slotTranslate() if (::qstrcmp(wc->name(), "unnamed") == 0) continue; - if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0) + if (::qstrcmp(wc->className(), "TQLabel") == 0) ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 || - ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0) + else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 || + ::qstrcmp(wc->className(), "TQVGroupBox") == 0) ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 || + else if (::qstrcmp(wc->className(), "TQPushButton") == 0 || ::qstrcmp(wc->className(), "KMenuButton") == 0) ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0) + else if (::qstrcmp(wc->className(), "TQCheckBox") == 0) ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) ); } delete list; diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index abc1a47f9..33c0ce5a5 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -42,7 +42,7 @@ class TDELocaleSample; class TDELocaleApplication : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TDELocaleApplication(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 2ff9d2c3c..41512a183 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -103,8 +103,8 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &) hbox->addStretch(1); TQTimer* timer=new TQTimer(this); timer->start(60000); - connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update())); - connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(m_updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(update())); + connect(timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update(); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcminfo"), diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h index f9bc2e082..aab4abb00 100644 --- a/kcontrol/nics/nic.h +++ b/kcontrol/nics/nic.h @@ -29,7 +29,7 @@ class TQListView; class KCMNic:public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMNic(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList( )); diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index 84959e34d..328e55294 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -28,12 +28,12 @@ extern "C" { - KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P ) + TDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::Config( parent_P, name_P ); } - KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P ) + TDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::KonquerorConfig( parent_P, name_P ); } @@ -52,11 +52,11 @@ Config::Config( TQWidget* parent_P, const char* ) tabs = new TQTabWidget( this ); konqueror_widget = new Konqueror( tabs ); konqueror_widget->layout()->setMargin( KDialog::marginHint() ); - connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( konqueror_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); tabs->addTab( konqueror_widget, i18n( "Konqueror" )); system_widget = new SystemWidget( tabs ); system_widget->layout()->setMargin( KDialog::marginHint() ); - connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( system_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); tabs->addTab( system_widget, i18n( "System" )); topLayout->add( tabs ); load(); @@ -110,7 +110,7 @@ KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* ) TQVBoxLayout *topLayout = new TQVBoxLayout( this ); widget = new Konqueror( this ); - connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); topLayout->add( widget ); load(); } diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h index 7e0660c60..fff281472 100644 --- a/kcontrol/performance/kcmperformance.h +++ b/kcontrol/performance/kcmperformance.h @@ -30,7 +30,7 @@ class SystemWidget; class Config : public TDECModule { - Q_OBJECT + TQ_OBJECT public: Config( TQWidget* parent_P, const char* name_P ); virtual void load(); @@ -47,7 +47,7 @@ class Config class KonquerorConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KonquerorConfig( TQWidget* parent_P, const char* name_P ); virtual void load(); diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index 8cd82699b..199522729 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -51,9 +51,9 @@ Konqueror::Konqueror( TQWidget* parent_P ) "thus reducing resource requirements." "<p>Be aware that this also means that, if something goes wrong, " "all your browsing windows will be closed simultaneously." )); - connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( rb_never_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( rb_file_browsing_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( rb_always_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); rb_file_browsing_reuse->setChecked( true ); TQString tmp = @@ -77,10 +77,10 @@ Konqueror::Konqueror( TQWidget* parent_P ) "so that windows will always open quickly." "<p><b>Warning:</b> In some cases, it is actually possible that this will " "reduce perceived performance." )); - connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int ))); - connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed())); - connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( preload_count_changed( int ))); + connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( changed())); + connect( cb_preload_on_startup, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( cb_always_have_preloaded, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/performance/konqueror.h b/kcontrol/performance/konqueror.h index e948f6b7a..bb6fb86c3 100644 --- a/kcontrol/performance/konqueror.h +++ b/kcontrol/performance/konqueror.h @@ -27,7 +27,7 @@ namespace KCMPerformance class Konqueror : public Konqueror_ui { - Q_OBJECT + TQ_OBJECT public: Konqueror( TQWidget* parent_P = NULL ); void load(bool useDefaults); diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 056e78193..43e8c4c43 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -51,7 +51,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P ) " or turn on the developer mode for the crash handler).</p>" ); TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp ); TQWhatsThis::add( label_tdebuildsycoca, tmp ); - connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( cb_disable_tdebuildsycoca, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h index cb570b506..50120aedf 100644 --- a/kcontrol/performance/system.h +++ b/kcontrol/performance/system.h @@ -29,7 +29,7 @@ namespace KCMPerformance class SystemWidget : public System_ui { - Q_OBJECT + TQ_OBJECT public: SystemWidget( TQWidget* parent_P = NULL ); void load( bool useDefaults ); diff --git a/kcontrol/pics/cr128-app-background.png b/kcontrol/pics/cr128-app-background.png Binary files differindex 3aff44a08..3bf8c1210 100644..100755 --- a/kcontrol/pics/cr128-app-background.png +++ b/kcontrol/pics/cr128-app-background.png diff --git a/kcontrol/pics/cr128-app-kcmkwm.png b/kcontrol/pics/cr128-app-kcmkwm.png Binary files differindex e7278ae4d..6edeec619 100644..100755 --- a/kcontrol/pics/cr128-app-kcmkwm.png +++ b/kcontrol/pics/cr128-app-kcmkwm.png diff --git a/kcontrol/pics/cr16-app-background.png b/kcontrol/pics/cr16-app-background.png Binary files differindex 63a893333..b32a42a1e 100644..100755 --- a/kcontrol/pics/cr16-app-background.png +++ b/kcontrol/pics/cr16-app-background.png diff --git a/kcontrol/pics/cr16-app-kcmkwm.png b/kcontrol/pics/cr16-app-kcmkwm.png Binary files differindex 6bc50e3b8..017044d6f 100644..100755 --- a/kcontrol/pics/cr16-app-kcmkwm.png +++ b/kcontrol/pics/cr16-app-kcmkwm.png diff --git a/kcontrol/pics/cr22-app-background.png b/kcontrol/pics/cr22-app-background.png Binary files differindex d4eaaaa89..571590eb5 100644..100755 --- a/kcontrol/pics/cr22-app-background.png +++ b/kcontrol/pics/cr22-app-background.png diff --git a/kcontrol/pics/cr22-app-kcmkwm.png b/kcontrol/pics/cr22-app-kcmkwm.png Binary files differindex cd0271118..96e44ce6f 100644..100755 --- a/kcontrol/pics/cr22-app-kcmkwm.png +++ b/kcontrol/pics/cr22-app-kcmkwm.png diff --git a/kcontrol/pics/cr32-app-background.png b/kcontrol/pics/cr32-app-background.png Binary files differindex ffc5ffaff..998b51050 100644..100755 --- a/kcontrol/pics/cr32-app-background.png +++ b/kcontrol/pics/cr32-app-background.png diff --git a/kcontrol/pics/cr32-app-kcmkwm.png b/kcontrol/pics/cr32-app-kcmkwm.png Binary files differindex 4d9fd6b87..852d31e76 100644..100755 --- a/kcontrol/pics/cr32-app-kcmkwm.png +++ b/kcontrol/pics/cr32-app-kcmkwm.png diff --git a/kcontrol/pics/cr48-app-background.png b/kcontrol/pics/cr48-app-background.png Binary files differindex 631905b93..3a0648c06 100644..100755 --- a/kcontrol/pics/cr48-app-background.png +++ b/kcontrol/pics/cr48-app-background.png diff --git a/kcontrol/pics/cr48-app-kcmkwm.png b/kcontrol/pics/cr48-app-kcmkwm.png Binary files differindex b4b30269e..8398222b8 100644..100755 --- a/kcontrol/pics/cr48-app-kcmkwm.png +++ b/kcontrol/pics/cr48-app-kcmkwm.png diff --git a/kcontrol/pics/cr64-app-background.png b/kcontrol/pics/cr64-app-background.png Binary files differindex 50706c290..04fed1c0a 100644..100755 --- a/kcontrol/pics/cr64-app-background.png +++ b/kcontrol/pics/cr64-app-background.png diff --git a/kcontrol/pics/cr64-app-kcmkwm.png b/kcontrol/pics/cr64-app-kcmkwm.png Binary files differindex 982afdb16..76305acc8 100644..100755 --- a/kcontrol/pics/cr64-app-kcmkwm.png +++ b/kcontrol/pics/cr64-app-kcmkwm.png diff --git a/kcontrol/pics/crsc-app-background.svgz b/kcontrol/pics/crsc-app-background.svgz Binary files differindex 0230d69c8..8098a345f 100644..100755 --- a/kcontrol/pics/crsc-app-background.svgz +++ b/kcontrol/pics/crsc-app-background.svgz diff --git a/kcontrol/pics/crsc-app-kcmkwm.svgz b/kcontrol/pics/crsc-app-kcmkwm.svgz Binary files differindex f9993b78c..6af01fcb3 100644..100755 --- a/kcontrol/pics/crsc-app-kcmkwm.svgz +++ b/kcontrol/pics/crsc-app-kcmkwm.svgz diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index c1ff81338..7f32c438a 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -22,13 +22,13 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kprocess.h> +#include <tdesimpleconfig.h> +#include <tdeprocess.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> #include <tderecentdocument.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstringlist.h> #include <tqfile.h> @@ -36,8 +36,8 @@ KPrivacyManager::KPrivacyManager() { - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); m_error = false; } @@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails() bool KPrivacyManager::clearRunCommandHistory() const { - return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); + return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); } bool KPrivacyManager::clearAllCookies() const { - return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); + return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); } bool KPrivacyManager::clearSavedClipboardContents() @@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents() return true; } - return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); + return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); } bool KPrivacyManager::clearFormCompletion() const @@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const bool KPrivacyManager::clearQuickStartMenu() const { - return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); + return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); } bool KPrivacyManager::clearWebHistory() @@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory() if(!isApplicationRegistered("konqueror")) { kdDebug() << "couldn't find Konqueror instance, preloading." << endl; - kapp->tdeinitExec("konqueror", args, 0,0); + tdeApp->tdeinitExec("konqueror", args, 0,0); } - return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyClear(TQCString)", TQString("") ); } @@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData() bool KPrivacyManager::isApplicationRegistered(const TQString &appName) { - QCStringList regApps = kapp->dcopClient()->registeredApplications(); + QCStringList regApps = tdeApp->dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it ) if((*it).find(appName.latin1()) != -1) return true; diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h index 70d7b77cf..b0649c7c2 100644 --- a/kcontrol/privacy/kprivacymanager.h +++ b/kcontrol/privacy/kprivacymanager.h @@ -29,7 +29,7 @@ class KPrivacyManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: KPrivacyManager(); diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 71fc3313b..87247547e 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name) clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites")); clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files")); - connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed())); + connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed())); // store all entries in a list for easy access later on checklist.append(clearThumbnails); @@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name) checklist.append(clearFavIcons); checklist.append(clearKPDFDocData); - connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup())); - connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll())); - connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone())); + connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup())); + connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll())); + connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone())); load(); } @@ -318,7 +318,7 @@ void Privacy::cleanup() extern "C" { - KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/) { TDEGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 74d199dcf..808bf3f98 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -30,7 +30,7 @@ class Privacy: public TDECModule { - Q_OBJECT + TQ_OBJECT public: Privacy( TQWidget *parent=0, const char *name=0 ); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 662817303..1b6a5faac 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -41,7 +41,7 @@ class ConfigDialog; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TDEGlobalAccel *accel, bool isApplet ); diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 1aa0f58df..140234a90 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -35,9 +35,9 @@ #include "ktimerdialog.h" #include "ktimerdialog.moc" -KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, +KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent, const char *name, bool modal, - const QString &caption, + const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator, const KGuiItem &user1, @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -90,7 +90,7 @@ int KTimerDialog::exec() return KDialogBase::exec(); } -void KTimerDialog::setMainWidget( QWidget *widget ) +void KTimerDialog::setMainWidget( TQWidget *widget ) { // yuck, here goes. QVBox *newWidget = new QVBox( this ); diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h index 23b4a92b0..74891d048 100644 --- a/kcontrol/randr/ktimerdialog.h +++ b/kcontrol/randr/ktimerdialog.h @@ -44,7 +44,7 @@ class QLabel; */ class KTimerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase * * For the rest of the arguments, See @see KDialogBase . */ - KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0, + KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0, const char *name=0, bool modal=true, - const QString &caption=QString::null, + const TQString &caption=TQString::null, int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok, bool separator=false, const KGuiItem &user1=KGuiItem(), @@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase * Overridden function which is used to set the main widget of the dialog. * @see KDialogBase::setMainWidget. */ - void setMainWidget( QWidget *widget ); + void setMainWidget( TQWidget *widget ); signals: /** diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index e2a4b46f2..a6d704e30 100644 --- a/kcontrol/randr/tderandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -28,7 +28,7 @@ KRandRApp::KRandRApp() : m_tray(new KRandRSystemTray(0L, "RANDRTray")) { - connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent())); + connect(&m_eventMergingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(handleX11ConfigChangeEvent())); m_tray->show(); } @@ -41,7 +41,7 @@ void KRandRApp::handleX11ConfigChangeEvent() bool KRandRApp::x11EventFilter(XEvent* e) { if (e->type == m_tray->screenChangeNotifyEvent()) { - m_eventMergingTimer.start(1000, TRUE); + m_eventMergingTimer.start(1000, true); } return TDEApplication::x11EventFilter( e ); } diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h index 004da6294..4a2856ad4 100644 --- a/kcontrol/randr/tderandrapp.h +++ b/kcontrol/randr/tderandrapp.h @@ -20,13 +20,13 @@ #define TDERANDRAPP_H #include <tqtimer.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KRandRSystemTray; -class KRandRApp : public KUniqueApplication +class KRandRApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KRandRApp(); diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index b95441f08..a5ad3fe6d 100644 --- a/kcontrol/randr/tderandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 11263bbf4..b8a53ce89 100644 --- a/kcontrol/randr/tderandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -48,12 +48,12 @@ K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") ) extern "C" { - KDE_EXPORT void init_randr() + TDE_EXPORT void init_randr() { KRandRModule::performApplyOnStartup(); } - KDE_EXPORT bool test_randr() + TDE_EXPORT bool test_randr() { int eventBase, errorBase; if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) ) @@ -100,7 +100,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis screenLabel->setBuddy( m_screenSelector ); TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list.")); - connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int))); + connect(m_screenSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenChanged(int))); if (numScreens() <= 1) m_screenSelector->setEnabled(false); @@ -110,7 +110,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox); m_sizeCombo = new KComboBox(sizeBox); TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list.")); - connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int))); + connect(m_sizeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeChanged(int))); sizeLabel->setBuddy( m_sizeCombo ); TQHBox* refreshBox = new TQHBox(this); @@ -118,10 +118,10 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox); m_refreshRates = new KComboBox(refreshBox); TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list.")); - connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int))); + connect(m_refreshRates, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRefreshChanged(int))); rateLabel->setBuddy( m_refreshRates ); - m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); + m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); topLayout->addWidget(m_rotationGroup); m_rotationGroup->setRadioButtonExclusive(true); TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen.")); @@ -129,14 +129,14 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_applyOnStartup = new TQCheckBox(i18n("Apply settings on TDE startup"), this); topLayout->addWidget(m_applyOnStartup); TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when TDE starts.")); - connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_applyOnStartup, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); TQHBox* syncBox = new TQHBox(this); syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when TDE starts instead of being temporary.")); - connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_syncTrayApp, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); topLayout->addStretch(1); @@ -155,11 +155,11 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox) if (!checkbox) { TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } else { TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } } diff --git a/kcontrol/randr/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h index 65131ee26..73a13b623 100644 --- a/kcontrol/randr/tderandrmodule.h +++ b/kcontrol/randr/tderandrmodule.h @@ -27,7 +27,7 @@ class TQCheckBox; class KRandRModule : public TDECModule, public KRandrSimpleAPI { - Q_OBJECT + TQ_OBJECT public: KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args); diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 5d2010f94..8dad337b7 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -28,7 +28,7 @@ KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f ) : KPassivePopup( parent, name, f ) { - connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf())); + connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( slotPositionSelf())); } KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text, @@ -88,14 +88,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) } } if( x11_events ) - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); } bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( TQT_TQWIDGET( o ))) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); + && watched_widgets.contains( static_cast<TQWidget*>( o ))) + TQTimer::singleShot( 0, this, TQ_SLOT( slotPositionSelf())); return false; } diff --git a/kcontrol/randr/tderandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h index 3b1d4b4f6..87dac8c0d 100644 --- a/kcontrol/randr/tderandrpassivepopup.h +++ b/kcontrol/randr/tderandrpassivepopup.h @@ -27,7 +27,7 @@ class KRandrPassivePopup : public KPassivePopup { - Q_OBJECT + TQ_OBJECT public: static KRandrPassivePopup *message( const TQString &caption, const TQString &text, const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 ); diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 647f0eca7..0506639e3 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -36,7 +36,7 @@ #include <kstdguiitem.h> #include <tdeglobal.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <cstdlib> #include <unistd.h> @@ -59,15 +59,15 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection())) { TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); setPixmap(KSystemTray::loadIcon("randr")); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; //printf("Reading configuration...\n"); - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "tderandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc @@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support -// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized())); +// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized())); #endif randr_display = XOpenDisplay(NULL); @@ -88,7 +88,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) last_known_y = currentScreen()->currentPixelHeight(); } - t_config = new KSimpleConfig("kiccconfigrc"); + t_config = new TDESimpleConfig("kiccconfigrc"); TQString cur_profile; cur_profile = getCurrentProfile(); @@ -98,17 +98,17 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } /*! - * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user + * \b TQ_SLOT which called if tderandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ void KRandRSystemTray::_quit (){ - r_config = new KSimpleConfig("tderandrtrayrc"); + r_config = new TDESimpleConfig("tderandrtrayrc"); TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); @@ -147,7 +147,7 @@ void KRandRSystemTray::showEvent ( TQShowEvent * ) void KRandRSystemTray::mousePressEvent(TQMouseEvent* e) { // Popup the context menu with left-click - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); e->accept(); @@ -195,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration() if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { continue; } - + // Activate this output randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); - + main_low_apply(randr_screen_info); + if (randr_screen_info->outputs[i]->cur_crtc) { // Output successfully activated! set_primary_output(randr_screen_info, randr_screen_info->cur_output->id); @@ -253,25 +253,28 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) menu->setCheckable(true); bool valid = isValid(); - - if (!valid) { + if (!valid) + { lastIndex = menu->insertItem(i18n("Required X Extension Not Available")); menu->setItemEnabled(lastIndex, false); - } - else { + else + { m_screenPopups.clear(); - for (int s = 0; s < numScreens() /*&& numScreens() > 1 */; s++) { - setCurrentScreen(s); - if (s == screenIndexOfWidget(this)) { - /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); - menu->setItemEnabled(lastIndex, false);*/ - } else { - TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); - m_screenPopups.append(subMenu); - populateMenu(subMenu); - lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated())); + if (numScreens() > 1) + { + int screenOfWidget = screenIndexOfWidget(this); + for (int s = 0; s < numScreens(); s++) + { + setCurrentScreen(s); + if (s != screenOfWidget) + { + TDEPopupMenu *subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); + m_screenPopups.append(subMenu); + populateMenu(subMenu); + lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated())); + } } } @@ -282,52 +285,52 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) addOutputMenu(menu); // Find any user ICC profiles - TQStringList cfgProfiles; - cfgProfiles = t_config->groupList(); - if (cfgProfiles.isEmpty() == false) { - menu->insertTitle(SmallIcon("kcoloredit"), i18n("Color Profile")); - } - for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) { - lastIndex = menu->insertItem(*t); - if (t_config->readEntry("CurrentProfile") == (*t)) { - menu->setItemChecked(lastIndex, true); + TQStringList cfgProfiles = t_config->groupList(); + if (!cfgProfiles.isEmpty()) + { + TDEPopupMenu *profileMenu = new TDEPopupMenu(menu); + for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) + { + lastIndex = profileMenu->insertItem(*t); + if (t_config->readEntry("CurrentProfile") == (*t)) + { + profileMenu->setItemChecked(lastIndex, true); + } + profileMenu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); + profileMenu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int))); } - menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); - menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int))); + menu->insertItem(SmallIcon("kcoloredit"), i18n("Color Profile"), profileMenu); } - if (valid) { + if (valid) + { // Find any display profiles - TQStringList displayProfiles; - displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true)); - if (!displayProfiles.isEmpty()) { - menu->insertTitle(SmallIcon("background"), i18n("Display Profiles")); - lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>"); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); - for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) { - lastIndex = menu->insertItem(SmallIcon("bookmark"), *t); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); + TQStringList displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true)); + if (!displayProfiles.isEmpty()) + { + TDEPopupMenu *displayProfileMenu = new TDEPopupMenu(menu); + lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), "<default>"); + displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); + for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) + { + lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), *t); + displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); } + menu->insertItem(SmallIcon("background"), i18n("Display Profiles"), displayProfileMenu); } } - menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration")); - - TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ), - actionCollection() ); - actColors->plug( menu ); - -// TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ), -// SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ), -// actionCollection() ); -// actPrefs->plug( menu ); - - TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), - actionCollection() ); - actSKeys->plug( menu ); + // Config menu + TDEPopupMenu *configMenu = new TDEPopupMenu(menu); + TDEAction *actColors = new TDEAction(i18n("Configure Displays..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotDisplayConfig()), actionCollection()); + actColors->plug(configMenu); + TDEAction *actSKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotSKeys()), actionCollection()); + actSKeys->plug(configMenu); + menu->insertItem(SmallIcon("randr"), i18n("Global Configuration"), configMenu); + menu->insertSeparator(); menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu()); TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); quitAction->plug(menu); @@ -411,74 +414,85 @@ int KRandRSystemTray::GetHackResolutionParameter() { return resparm; } -void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) +void KRandRSystemTray::populateMenu(TDEPopupMenu *menu) { - int lastIndex = 0; - - menu->insertTitle(SmallIcon("view-fullscreen"), i18n("Screen Size")); + int lastIndex; int numSizes = currentScreen()->numSizes(); - int* sizeSort = new int[numSizes]; - - for (int i = 0; i < numSizes; i++) { + int *sizeSort = new int[numSizes]; + for (int i = 0; i < numSizes; i++) + { sizeSort[i] = currentScreen()->pixelCount(i); } - for (int j = 0; j < numSizes; j++) { - int highest = -1, highestIndex = -1; - - for (int i = 0; i < numSizes; i++) { - if (sizeSort[i] && sizeSort[i] > highest) { + TDEPopupMenu *screenSizeMenu = new TDEPopupMenu(menu); + for (int j = 0; j < numSizes; j++) + { + int highest = 0, highestIndex = -1; + for (int i = 0; i < numSizes; i++) + { + if (sizeSort[i] > highest) + { highest = sizeSort[i]; highestIndex = i; } } - sizeSort[highestIndex] = -1; Q_ASSERT(highestIndex != -1); + sizeSort[highestIndex] = 0; - lastIndex = menu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height())); - + lastIndex = screenSizeMenu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height())); if (currentScreen()->proposedSize() == highestIndex) - menu->setItemChecked(lastIndex, true); + { + screenSizeMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, highestIndex); - menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int))); + screenSizeMenu->setItemParameter(lastIndex, highestIndex); + screenSizeMenu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int))); } delete [] sizeSort; - sizeSort = 0L; + sizeSort = nullptr; + + menu->insertItem(SmallIcon("view-fullscreen"), i18n("Screen Size"), screenSizeMenu); // Don't display the rotation options if there is no point (ie. none are supported) // XFree86 4.3 does not include rotation support. - if (currentScreen()->rotations() != RandRScreen::Rotate0) { - menu->insertTitle(SmallIcon("reload"), i18n("Orientation")); - - for (int i = 0; i < 6; i++) { - if ((1 << i) & currentScreen()->rotations()) { - lastIndex = menu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i)); - + if (currentScreen()->rotations() != RandRScreen::Rotate0) + { + TDEPopupMenu *orientationMenu = new TDEPopupMenu(menu); + for (int i = 0; i < 6; i++) + { + if ((1 << i) & currentScreen()->rotations()) + { + lastIndex = orientationMenu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i)); if (currentScreen()->proposedRotation() & (1 << i)) - menu->setItemChecked(lastIndex, true); + { + orientationMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, 1 << i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int))); + orientationMenu->setItemParameter(lastIndex, 1 << i); + orientationMenu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int))); } } + menu->insertItem(SmallIcon("reload"), i18n("Orientation"), orientationMenu); } TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); - if (rr.count()) - menu->insertTitle(SmallIcon("clock"), i18n("Refresh Rate")); - - int i = 0; - for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) { - lastIndex = menu->insertItem(*it); - - if (currentScreen()->proposedRefreshRate() == i) - menu->setItemChecked(lastIndex, true); + { + TDEPopupMenu *refreshRatesMenu = new TDEPopupMenu(menu); + int i = 0; + for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) + { + lastIndex = refreshRatesMenu->insertItem(*it); + if (currentScreen()->proposedRefreshRate() == i) + { + refreshRatesMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int))); + refreshRatesMenu->setItemParameter(lastIndex, i); + refreshRatesMenu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int))); + } + menu->insertItem(SmallIcon("clock"), i18n("Refresh Rate"), refreshRatesMenu); } } @@ -738,86 +752,89 @@ void KRandRSystemTray::findPrimaryDisplay() } } -void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) +void KRandRSystemTray::addOutputMenu(TDEPopupMenu *menu) { XRROutputInfo *output_info; char *output_name; - int i; int lastIndex = 0; int connected_displays = 0; - if (isValid() == true) { - menu->insertTitle(SmallIcon("kcmkwm"), i18n("Output Port")); + if (isValid()) + { + TDEPopupMenu *outputMenu = new TDEPopupMenu(menu); - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for active (i.e. switched on) outputs + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for ON outputs - if (!randr_screen_info->outputs[i]->cur_crtc) { + if (!randr_screen_info->outputs[i]->cur_crtc) + { continue; } - if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) + { continue; } output_name = output_info->name; - //printf("ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name)); - menu->setItemChecked(lastIndex, true); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Active)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, true); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); connected_displays++; } - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for inactive (i.e. switched off) but connected outputs + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for CONNECTED outputs.... - if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) + { continue; } - // ...that are not ON - if (randr_screen_info->outputs[i]->cur_crtc) { + if (randr_screen_info->outputs[i]->cur_crtc) + { continue; } output_name = output_info->name; - //printf("CONNECTED, NOT ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); - menu->setItemChecked(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, false); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); connected_displays++; } - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for all outputs that are not connected + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for ALL outputs that are not connected.... - if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection) + { continue; } - // ...or ON - if (randr_screen_info->outputs[i]->cur_crtc) { + if (randr_screen_info->outputs[i]->cur_crtc) + { continue; } output_name = output_info->name; - //printf("DISCONNECTED, NOT ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); - menu->setItemChecked(lastIndex, false); - menu->setItemEnabled(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, false); + outputMenu->setItemEnabled(lastIndex, false); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); } - lastIndex = menu->insertItem(SmallIcon("forward"), i18n("Next available output")); - if (connected_displays < 2) { - menu->setItemEnabled(lastIndex, false); + if (connected_displays >= 2) + { + lastIndex = outputMenu->insertItem(SmallIcon("forward"), i18n("Next available output")); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays())); } - menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays())); + + menu->insertItem(SmallIcon("kcmkwm"), i18n("Output Port"), outputMenu); } } @@ -834,7 +851,7 @@ void KRandRSystemTray::slotDisplayProfileChanged(int parameter) profileName = ""; } TQPtrList<SingleScreenData> profileData = loadDisplayConfiguration(profileName, locateLocal("config", "/", true)); - applyDisplayConfiguration(profileData, TRUE, locateLocal("config", "/", true)); + applyDisplayConfiguration(profileData, true, locateLocal("config", "/", true)); destroyScreenInformationObject(profileData); } @@ -862,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); if (!randr_screen_info->outputs[parameter]->cur_crtc) { output_name = randr_screen_info->outputs[parameter]->info->name; @@ -877,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 0; randr_screen_info->cur_output->off_set = 1; output_off(randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); findPrimaryDisplay(); refresh(); @@ -907,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { void KRandRSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "tderandrtray"); + tdeApp->invokeHelp(TQString::null, "tderandrtray"); } diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index ef6fd7bd0..5d6e16053 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -22,7 +22,7 @@ #include <tqptrlist.h> #include <ksystemtray.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> @@ -37,7 +37,7 @@ class TDEPopupMenu; class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI { - Q_OBJECT + TQ_OBJECT public: KRandRSystemTray(TQWidget* parent = 0, const char *name = 0); @@ -91,8 +91,8 @@ private: int last_known_y; TDEPopupMenu* m_menu; - KSimpleConfig *r_config; - KSimpleConfig *t_config; + TDESimpleConfig *r_config; + TDESimpleConfig *t_config; private slots: void _quit(); diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index c25867fa5..b4553c6a8 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -56,7 +56,7 @@ ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name " resource is mounted.") ); timer.start(10000); - TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList())); + TQObject::connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList())); updateList(); } diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index 0897af021..7b8732c9f 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -30,7 +30,7 @@ class ImportsView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0); virtual ~ImportsView() {}; diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index c25a01113..fdb21bb1e 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -59,7 +59,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) subLayout->addWidget(&showConnClose,1,0); subLayout->addWidget(&showFileOpen,0,1); subLayout->addWidget(&showFileClose,1,1); - mainLayout->addWidget(&updateButton,0,Qt::AlignLeft); + mainLayout->addWidget(&updateButton,0,TQt::AlignLeft); TQWhatsThis::add( &logFileName, i18n("This page presents the contents of" " your samba log file in a friendly layout. Check that the correct log" @@ -90,8 +90,8 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) logFileName.setURL("/var/log/samba.log"); - viewHistory.setAllColumnsShowFocus(TRUE); - viewHistory.setFocusPolicy(TQ_ClickFocus); + viewHistory.setAllColumnsShowFocus(true); + viewHistory.setFocusPolicy(TQWidget::ClickFocus); viewHistory.setShowSortIndicator(true); viewHistory.addColumn(i18n("Date & Time"),130); @@ -108,12 +108,12 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) " If the list is empty, try clicking the \"Update\" button. The samba" " log file will be read and the list refreshed.") ); - showConnOpen.setChecked(TRUE); - showConnClose.setChecked(TRUE); - showFileOpen.setChecked(FALSE); - showFileClose.setChecked(FALSE); + showConnOpen.setChecked(true); + showConnClose.setChecked(true); + showFileOpen.setChecked(false); + showFileClose.setChecked(false); - connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); + connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); label.setMinimumSize(label.sizeHint()); @@ -132,10 +132,10 @@ void LogView::loadSettings() configFile->setGroup(LOGGROUPNAME); logFileName.setURL(configFile->readPathEntry( "SambaLogFile", "/var/log/samba.log")); - showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", TRUE)); - showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", FALSE)); - showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", TRUE)); - showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", FALSE)); + showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", true)); + showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", false)); + showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", true)); + showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", false)); } void LogView::saveSettings() @@ -161,7 +161,7 @@ void LogView::updateList() TQFile logFile(logFileName.url()); if (logFile.open(IO_ReadOnly)) { - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); viewHistory.clear(); filesCount=0; connectionsCount=0; diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index c3c8c07ea..99a259ddf 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -38,7 +38,7 @@ class LogView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0); virtual ~LogView() {}; diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 3b77dbc9f..650c43a05 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -59,8 +59,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this ); expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); - viewStatistics->setAllColumnsShowFocus(TRUE); - viewStatistics->setFocusPolicy(TQ_ClickFocus); + viewStatistics->setAllColumnsShowFocus(true); + viewStatistics->setFocusPolicy(TQWidget::ClickFocus); viewStatistics->setShowSortIndicator(true); viewStatistics->addColumn(i18n("Nr"),30); @@ -73,8 +73,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n eventCb->insertItem(i18n("Connection")); eventCb->insertItem(i18n("File Access")); - expandedInfoCb->setChecked(FALSE); - expandedUserCb->setChecked(FALSE); + expandedInfoCb->setChecked(false); + expandedUserCb->setChecked(false); clearStatistics(); serviceLe->setText("*"); hostLe->setText("*"); @@ -116,8 +116,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n subLayout->addWidget(expandedInfoCb,3,1); subLayout->addWidget(expandedUserCb,3,2); - connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics())); - connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate())); + connect(clearButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearStatistics())); + connect(calcButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(calculate())); setListInfo(0,0,0); } @@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec void StatisticsView::calculate() { if (dataList==0) return; - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); int connCount(0); if (eventCb->currentText()==i18n("Connection")) connCount=1; @@ -142,8 +142,8 @@ void StatisticsView::calculate() if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked())) { SambaLog sLog; - TQRegExp rService(serviceLe->text(),FALSE,TRUE); - TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQRegExp rService(serviceLe->text(),false,true); + TQRegExp rHost(hostLe->text(),false,true); TQString item2, item3; TQListViewItem* item=dataList->firstChild(); while (item!=0) @@ -194,8 +194,8 @@ void StatisticsView::calculate() { calcCount++; int count(0); - TQRegExp rService(serviceLe->text(),FALSE,TRUE); - TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQRegExp rService(serviceLe->text(),false,true); + TQRegExp rHost(hostLe->text(),false,true); TQListViewItem* item=dataList->firstChild(); while (item!=0) { diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 4b6ad6211..cf7817ce5 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -50,7 +50,7 @@ class LogItem LogItem():name(""), accessed(),count(0) {}; LogItem(TQString n, TQString a):name(n), accessed(), count(1) { - accessed.setAutoDelete(TRUE); + accessed.setAutoDelete(true); accessed.append(new SmallLogItem(a)); }; TQString name; @@ -66,7 +66,7 @@ class SambaLog public: SambaLog() { - items.setAutoDelete(TRUE); + items.setAutoDelete(true); }; TQPtrList<LogItem> items; void addItem (TQString share, TQString host); @@ -77,7 +77,7 @@ class SambaLog class StatisticsView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0); virtual ~StatisticsView() {}; diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index abd423d13..e51a3c137 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -70,7 +70,7 @@ NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name ) timer = new TQTimer(this); timer->start(15000); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); update(); } @@ -175,8 +175,8 @@ void NetMon::update() nrpid=0; process->setEnvironment("PATH", path); connect(process, - TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotReceivedData(TDEProcess *, char *, int))); *process << "smbstatus"; if (!process->start(TDEProcess::Block,TDEProcess::Stdout)) version->setText(i18n("Error: Unable to run smbstatus")); @@ -200,12 +200,12 @@ void NetMon::update() showmountProc=new TDEProcess(); showmountProc->setEnvironment("PATH", path); *showmountProc<<"showmount"<<"-a"<<"localhost"; - connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); + connect(showmountProc,TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQ_SLOT(slotReceivedData(TDEProcess *, char *, int))); //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running - TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount())); + TQTimer::singleShot(5000,this,TQ_SLOT(killShowmount())); //kdDebug()<<"starting kill timer with 5 seconds"<<endl; - connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount())); + connect(showmountProc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(killShowmount())); if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount { delete showmountProc; diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index f787293ae..41eba7207 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -21,7 +21,7 @@ #include <tqtimer.h> #include <tqlabel.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcstring.h> #include <tqlistview.h> #include <tdeconfig.h> @@ -34,7 +34,7 @@ class TDEProcess; class NetMon : public TQWidget { -Q_OBJECT +TQ_OBJECT public: NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0); void saveSettings() {}; diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index d5af28c1a..4bb099fae 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -66,7 +66,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin tabs.addTab(&imports,i18n("&Imports")); tabs.addTab(&logView,i18n("&Log")); tabs.addTab(&statisticsView,i18n("&Statistics")); - connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int))); + connect(&logView,TQ_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQ_SLOT(setListInfo(TQListView *, int, int))); setButtons(Help); load(); diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 7a28178d5..ca4bbfae6 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -1,5 +1,5 @@ #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqcombobox.h> #include <kdebug.h> @@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c readSettings(); - connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPriorityChanged(int))); - - connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbPriority, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPriorityChanged(int))); + + connect(dialog->qcbTopLeft, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbTopRight, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomLeft, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomRight, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); #ifndef HAVE_SETPRIORITY dialog->qgbPriority->setEnabled(false); diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h index 87ee03a31..4ddb9abc7 100644 --- a/kcontrol/screensaver/advanceddialog.h +++ b/kcontrol/screensaver/advanceddialog.h @@ -27,7 +27,7 @@ public: class KScreenSaverAdvancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0); diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h index 11ec33a74..4c96daf41 100644 --- a/kcontrol/screensaver/kswidget.h +++ b/kcontrol/screensaver/kswidget.h @@ -6,7 +6,7 @@ class KSWidget : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 ); virtual ~KSWidget(); diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index 75ee227f1..f85740911 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -1,4 +1,4 @@ -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include "saverconfig.h" @@ -9,7 +9,7 @@ SaverConfig::SaverConfig() bool SaverConfig::read(const TQString &file) { - KDesktopFile config(file, true); + TDEDesktopFile config(file, true); if( !config.tryExec()) return false; mExec = config.readPathEntry("Exec"); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index cd30fa1a1..c639bba4e 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -40,10 +40,10 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <knuminput.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservicegroup.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <X11/Xlib.h> #include "scrnsave.h" @@ -84,10 +84,10 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis struct stat st; if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) { - mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" )); + mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" )); } else { - mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" )); + mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" )); } mTDMConfig->setGroup("X-:*-Greeter"); @@ -124,12 +124,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis readSettings( false ); mSetupProc = new TDEProcess; - connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotSetupDone(TDEProcess *))); + connect(mSetupProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotSetupDone(TDEProcess *))); mPreviewProc = new TDEProcess; - connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotPreviewExited(TDEProcess *))); + connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotPreviewExited(TDEProcess *))); TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); @@ -140,7 +140,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint()); mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this ); - mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); + mSaverGroup->setColumnLayout( 0, TQt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), @@ -153,31 +153,31 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverListView->header()->hide(); mSelected = -1; groupLayout->addWidget( mSaverListView, 10 ); - connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup())); + connect( mSaverListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotSetup())); TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") ); TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint()); mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup ); - connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) ); + connect( mSetupBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetup() ) ); mSetupBt->setEnabled(false); hlay->addWidget( mSetupBt ); TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") ); mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup ); - connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) ); + connect( mTestBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotTest() ) ); mTestBt->setEnabled(false); hlay->addWidget( mTestBt ); TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") ); mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); - mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); + mSettingsGroup->setColumnLayout( 0, TQt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup); mEnabledCheckBox->setChecked(mEnabled); TQWhatsThis::add( mEnabledCheckBox, i18n("Automatically start the screen saver after a period of inactivity.") ); - connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnable(bool))); + connect(mEnabledCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnable(bool))); settingsGroupLayout->addWidget(mEnabledCheckBox, 0, 0); TQBoxLayout *hbox = new TQHBoxLayout(); @@ -192,8 +192,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitEdit->setSuffix(i18n(" min")); mWaitEdit->setValue(mTimeout/60); mWaitEdit->setEnabled(mEnabled); - connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimeoutChanged(int))); + connect(mWaitEdit, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimeoutChanged(int))); mActivateLbl->setBuddy(mWaitEdit); hbox->addWidget(mWaitEdit); hbox->addStretch(1); @@ -204,7 +204,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mLockCheckBox = new TQCheckBox( i18n("&Require password to stop"), mSettingsGroup ); mLockCheckBox->setEnabled( mEnabled ); mLockCheckBox->setChecked( mLock ); - connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotLock( bool ) ) ); + connect( mLockCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotLock( bool ) ) ); settingsGroupLayout->addWidget(mLockCheckBox, 2, 0); TQWhatsThis::add( mLockCheckBox, i18n("Prevent potential unauthorized use by requiring a password to stop the screen saver.") ); @@ -230,7 +230,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } - connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); + connect(mWaitLockEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLockTimeoutChanged(int))); mLockLbl->setBuddy(mWaitLockEdit); hbox->addWidget(mWaitLockEdit); hbox->addStretch(1); @@ -241,35 +241,35 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mDelaySaverStartCheckBox = new TQCheckBox( i18n("&Delay saver start after lock"), mSettingsGroup ); mDelaySaverStartCheckBox->setEnabled( true ); mDelaySaverStartCheckBox->setChecked( mDelaySaverStart ); - connect( mDelaySaverStartCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotDelaySaverStart( bool ) ) ); + connect( mDelaySaverStartCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotDelaySaverStart( bool ) ) ); settingsGroupLayout->addWidget(mDelaySaverStartCheckBox, 0, 1); TQWhatsThis::add( mDelaySaverStartCheckBox, i18n("When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed.") ); mUseTSAKCheckBox = new TQCheckBox( i18n("&Use Secure Attention Key"), mSettingsGroup ); mUseTSAKCheckBox->setEnabled( true ); mUseTSAKCheckBox->setChecked( mUseTSAK ); - connect( mUseTSAKCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseTSAK( bool ) ) ); + connect( mUseTSAKCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseTSAK( bool ) ) ); settingsGroupLayout->addWidget(mUseTSAKCheckBox, 1, 1); TQWhatsThis::add( mUseTSAKCheckBox, i18n("Require Secure Attention Key prior to displaying the unlock dialog.") ); mUseUnmanagedLockWindowsCheckBox = new TQCheckBox( i18n("Use &legacy lock windows"), mSettingsGroup ); mUseUnmanagedLockWindowsCheckBox->setEnabled( true ); mUseUnmanagedLockWindowsCheckBox->setChecked( mUseUnmanagedLockWindows ); - connect( mUseUnmanagedLockWindowsCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseUnmanagedLockWindows( bool ) ) ); + connect( mUseUnmanagedLockWindowsCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseUnmanagedLockWindows( bool ) ) ); settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1); TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") ); mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup ); mHideActiveWindowsFromSaverCheckBox->setEnabled( true ); mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver ); - connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) ); + connect( mHideActiveWindowsFromSaverCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotHideActiveWindowsFromSaver( bool ) ) ); settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1); TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") ); mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup ); mHideCancelButtonCheckBox->setEnabled( true ); mHideCancelButtonCheckBox->setChecked( mHideCancelButton ); - connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) ); + connect( mHideCancelButtonCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotHideCancelButton(bool)) ); settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1); TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog.")); @@ -288,8 +288,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis i18n( "Advanced &Options" ), this, "advancedBtn" ); advancedBt->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); - connect( advancedBt, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAdvanced() ) ); + connect( advancedBt, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAdvanced() ) ); advancedLayout->addWidget( advancedBt ); advancedLayout->addWidget( new TQWidget( this ) ); @@ -306,7 +306,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis // we've started up. mNumLoaded = 0; mLoadTimer = new TQTimer( this ); - connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) ); + connect( mLoadTimer, TQ_SIGNAL(timeout()), TQ_SLOT(findSavers()) ); mLoadTimer->start( 100 ); mChanged = false; emit changed(false); @@ -497,7 +497,7 @@ void KScreenSaver::save() // TODO (GJ): When you changed anything, these two lines will give a segfault // on exit. I don't know why yet. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); client->send("kdesktop", "KScreensaverIface", "configure()", TQString("")); mChanged = false; @@ -615,8 +615,8 @@ void KScreenSaver::findSavers() mTestBt->setEnabled(true); } - connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) ); + connect( mSaverListView, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotScreenSaver( TQListViewItem * ) ) ); setMonitor(); } @@ -842,7 +842,7 @@ void KScreenSaver::slotSetup() } mSetupBt->setEnabled( false ); - kapp->flushX(); + tdeApp->flushX(); mSetupProc->start(); } @@ -886,8 +886,8 @@ void KScreenSaver::slotTest() { mTestWin = new TestWin(); mTestWin->setBackgroundMode(TQWidget::NoBackground); - mTestWin->setGeometry(0, 0, kapp->desktop()->width(), - kapp->desktop()->height()); + mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(), + tdeApp->desktop()->height()); } mTestWin->show(); @@ -899,7 +899,7 @@ void KScreenSaver::slotTest() grabMouse(); grabKeyboard(); - mTestBt->setEnabled( FALSE ); + mTestBt->setEnabled( false ); mPreviewProc->kill(); while (!ts.atEnd()) diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index d52c81227..f7953f1e4 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -33,7 +33,7 @@ class TDEProcess; //=========================================================================== class KScreenSaver : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KScreenSaver(TQWidget *parent, const char *name, const TQStringList &); ~KScreenSaver(); @@ -125,7 +125,7 @@ protected: bool mHideActiveWindowsFromSaver; bool mHideCancelButton; - KSimpleConfig* mTDMConfig; + TDESimpleConfig* mTDMConfig; }; #endif diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index dd250e084..1055701f1 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -6,7 +6,7 @@ class QXEmbed; TestWin::TestWin() : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); KWin::setState( winId(), NET::StaysOnTop ); } diff --git a/kcontrol/screensaver/testwin.h b/kcontrol/screensaver/testwin.h index ff77b6b4d..a59dcd7e7 100644 --- a/kcontrol/screensaver/testwin.h +++ b/kcontrol/screensaver/testwin.h @@ -5,7 +5,7 @@ class TestWin : public KSWidget { - Q_OBJECT + TQ_OBJECT public: TestWin(); }; diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 3b32d63b7..d4ad3e1b7 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NoSmartcardBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NoSmartcardBase</cstring> </property> diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index f0891db16..998f936e8 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new TDEConfig("ksmartcardrc", false, false); - DCOPClient *dc = TDEApplication::kApplication()->dcopClient(); + DCOPClient *dc = tdeApp->dcopClient(); _ok = false; dc->remoteInterfaces("kded", "kardsvc", &_ok); @@ -72,19 +72,19 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), this, - TQT_SLOT(slotLaunchChooser())); + TQ_SLOT(slotLaunchChooser())); // The config backend - connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); - connect(base->beepOnInsert, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); - connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->launchManager, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); + connect(base->beepOnInsert, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); + connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); - connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->enablePolling, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); connect(base->_readerHostsListView, - TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)), + TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)), this, - TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int))); + TQ_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int))); @@ -92,7 +92,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) "", "signalReaderListChanged(TQStringList)", "loadReadersTab(TQStringList)", - FALSE)) + false)) kdDebug()<<"Error connecting to DCOP server" <<endl; @@ -101,7 +101,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) "", "signalCardStateChanged(TQString,bool,TQString)", "updateReadersState (TQString,bool,TQString) ", - FALSE)) + false)) kdDebug()<<"Error connecting to DCOP server" <<endl; _cardDB= new KCardDB(); @@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ // New view items TDEListViewItem * temp; - kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); (void) new TDEListViewItem(base->_readerHostsListView, @@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ TQDataStream argATR(dataATR,IO_WriteOnly); argATR << *_slot; - kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)", + tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)", dataATR, rettype, retval); @@ -263,14 +263,14 @@ void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant, type, subType, subSubType); - hil->setSelectable(FALSE); + hil->setSelectable(false); } else{ TDEListViewItem * hil =new TDEListViewItem(ant, i18n("No module managing this card")); - hil->setSelectable(FALSE); + hil->setSelectable(false); } } @@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults ) } // We call kardsvc to retrieve the current readers - kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()", + tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()", data, rettype, retval); TQStringList readers; readers.clear(); @@ -337,17 +337,17 @@ if (_ok) { // Start or stop the server as needed if (base->enableSupport->isChecked()) { - kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); config->sync(); - kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()", + tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()", data, rettype, retval); } else { - kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); } @@ -372,12 +372,12 @@ TQString KSmartcardConfig::quickHelp() const extern "C" { - KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *) { return new KSmartcardConfig(parent, "kcmsmartcard"); } - KDE_EXPORT void init_smartcard() + TDE_EXPORT void init_smartcard() { TDEConfig *config = new TDEConfig("ksmartcardrc", false, false); bool start = config->readBoolEntry("Enable Support", false); @@ -389,7 +389,7 @@ extern "C" TQDataStream arg(data, IO_WriteOnly); TQCString modName = "kardsvc"; arg << modName; - kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", + tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); } } diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index 7cb90478e..51cd7eddb 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -40,7 +40,7 @@ class TDEListViewItem; class KSmartcardConfig : public TDECModule, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index e7a3344ce..dd138d5b3 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SmartcardBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SmartcardBase</cstring> </property> @@ -23,7 +23,7 @@ <property name="enabled"> <bool>true</bool> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -127,7 +127,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -297,11 +297,11 @@ <includes> <include location="local" impldecl="in implementation">smartcardbase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotTestReader()</slot> <slot>enableSupport_toggled(bool)</slot> <slot>enablePolling_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 99f1b729a..c5e0ad784 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri TQVBoxLayout *topLayout = new TQVBoxLayout(this); dialog = new SMServerConfigImpl(this); - connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed())); dialog->show(); topLayout->add(dialog); @@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults ) c->setGroup("Logout"); dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); + dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false)); dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()), @@ -126,6 +127,7 @@ void SMServerConfig::save() c->writeEntry("excludeApps", dialog->excludeLineedit->text()); c->setGroup("Logout"); c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); + c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked()); c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked()); c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked()); c->sync(); @@ -133,7 +135,7 @@ void SMServerConfig::save() // update the k menu if necessary TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); } void SMServerConfig::defaults() diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h index c346033c6..31ea4d360 100644 --- a/kcontrol/smserver/kcmsmserver.h +++ b/kcontrol/smserver/kcmsmserver.h @@ -28,7 +28,7 @@ class SMServerConfigImpl; class SMServerConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 1449e9d6f..9179722c7 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -62,10 +62,10 @@ <bool>false</bool> </property> <property name="text"> - <string>Show &logout fadeaway</string> + <string>Fadeaway screen during &logout</string> </property> <property name="whatsThis" stdset="0"> - <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string> + <string>Check this option if you want screen to be faded when displaying a logout confirmation dialog box.</string> </property> </widget> <widget class="TQCheckBox"> @@ -76,10 +76,10 @@ <bool>false</bool> </property> <property name="text"> - <string>Sho&w fancy logout fadeaway</string> + <string>Use effects for logout fadea&way</string> </property> <property name="whatsThis" stdset="0"> - <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string> + <string>Check this option if you want to enable additional graphical effects for fadeaway during logout process. Namely the fadeaway will be smoothly animated and semitransparent.</string> </property> </widget> <widget class="TQCheckBox"> @@ -104,6 +104,17 @@ <string>Check this option if you want to see a dialog box showing the logout status.</string> </property> </widget> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>showUbuntuStyleDialog</cstring> + </property> + <property name="text"> + <string>Use &alternative shutdown dialog layout</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog.</string> + </property> + </widget> </vbox> </widget> <widget class="TQButtonGroup"> @@ -243,40 +254,22 @@ </widget> <connections> <connection> - <sender>confirmLogoutCheck</sender> - <signal>toggled(bool)</signal> - <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> - </connection> - <connection> <sender>confirmLogoutCheck</sender> <signal>toggled(bool)</signal> - <receiver>showFadeAway</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>confirmLogoutCheck</sender> - <signal>toggled(bool)</signal> - <receiver>showFancyFadeAway</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>showFadeAway</sender> - <signal>toggled(bool)</signal> - <receiver>showFancyFadeAway</receiver> - <slot>setEnabled(bool)</slot> + <receiver>SMServerConfigDlg</receiver> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showFadeAway</sender> <signal>toggled(bool)</signal> <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showFancyFadeAway</sender> <signal>toggled(bool)</signal> <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showLogoutStatusDialog</sender> @@ -285,6 +278,12 @@ <slot>configChanged()</slot> </connection> <connection> + <sender>showUbuntuStyleDialog</sender> + <signal>toggled(bool)</signal> + <receiver>SMServerConfigDlg</receiver> + <slot>configChanged()</slot> + </connection> + <connection> <sender>loginGroup</sender> <signal>clicked(int)</signal> <receiver>SMServerConfigDlg</receiver> @@ -316,12 +315,14 @@ </connection> </connections> <includes> + <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot>configChanged()</slot> -</Q_SLOTS> + <slot>fadeAwayConfigChanged()</slot> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp index d9507a9d8..af04d774a 100644 --- a/kcontrol/smserver/smserverconfigimpl.cpp +++ b/kcontrol/smserver/smserverconfigimpl.cpp @@ -18,14 +18,20 @@ #include "smserverconfigimpl.h" #include "smserverconfigimpl.moc" -SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) { +SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {} +SMServerConfigImpl::~SMServerConfigImpl() {} + +void SMServerConfigImpl::configChanged() +{ + emit changed(); } -SMServerConfigImpl::~SMServerConfigImpl(){ -} -/** No descriptions */ -void SMServerConfigImpl::configChanged(){ - emit changed(); +void SMServerConfigImpl::fadeAwayConfigChanged() +{ + // Update showFadeAway and showFancyFadeAway status correctly + showFadeAway->setEnabled(confirmLogoutCheck->isChecked()); + showFancyFadeAway->setEnabled(confirmLogoutCheck->isChecked() && showFadeAway->isChecked()); + configChanged(); } diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h index b516617cf..2e1186936 100644 --- a/kcontrol/smserver/smserverconfigimpl.h +++ b/kcontrol/smserver/smserverconfigimpl.h @@ -26,13 +26,14 @@ */ class SMServerConfigImpl : public SMServerConfigDlg { - Q_OBJECT + TQ_OBJECT public: SMServerConfigImpl(TQWidget *parent=0, const char *name=0); ~SMServerConfigImpl(); public slots: // Public slots /** No descriptions */ void configChanged(); + void fadeAwayConfigChanged(); signals: // Signals /** No descriptions */ void changed(); diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 805a98d6b..6816cd6c2 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -41,7 +41,7 @@ KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, c spellConfig = new KSpellConfig(box, 0L ,0L, false ); layout->addStretch(1); - connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() )); + connect(spellConfig,TQ_SIGNAL(configChanged()), TQ_SLOT( changed() )); setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the TDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The TDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between TDE applications and non-TDE applications.</p>")); @@ -56,9 +56,9 @@ void KSpellCheckingConfig::save() { spellConfig->writeGlobalSettings(); TQByteArray data; - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } void KSpellCheckingConfig::defaults() @@ -66,7 +66,7 @@ void KSpellCheckingConfig::defaults() spellConfig->setNoRootAffix(0); spellConfig->setRunTogether(0); spellConfig->setDictionary(""); - spellConfig->setDictFromList(FALSE); + spellConfig->setDictFromList(false); spellConfig->setEncoding (KS_E_UTF8); spellConfig->setClient (KS_CLIENT_ISPELL); } diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h index 10db546fd..dc94470cb 100644 --- a/kcontrol/spellchecking/spellchecking.h +++ b/kcontrol/spellchecking/spellchecking.h @@ -25,7 +25,7 @@ class KSpellConfig; class KSpellCheckingConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 49ca332dd..d72467364 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -51,9 +51,9 @@ #include <klibloader.h> #include <tdelistview.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestyle.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "../krdb/krdb.h" @@ -73,13 +73,13 @@ // Danimo: Why do we use the old interface?! extern "C" { - KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) + TDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) { TDEGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); } - KDE_EXPORT void init_style() + TDE_EXPORT void init_style() { uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings; TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/); @@ -92,11 +92,10 @@ extern "C" runRdb( flags ); // Write some Qt root property. -#ifndef __osf__ // this crashes under Tru64 randomly -- will fix later TQByteArray properties; TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. - d << kapp->palette() << TDEGlobalSettings::generalFont(); + d << tdeApp->palette() << TDEGlobalSettings::generalFont(); Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false); // do it for all root windows - multihead support @@ -105,7 +104,6 @@ extern "C" XChangeProperty(tqt_xdisplay(), RootWindow(tqt_xdisplay(), i), a, a, 8, PropModeReplace, (unsigned char*) properties.data(), properties.size()); -#endif } } @@ -156,21 +154,21 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) // Add Page1 (Style) // ----------------- gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); - gbWidgetStyle->setColumnLayout( 0, Qt::Vertical ); + gbWidgetStyle->setColumnLayout( 0, TQt::Vertical ); gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); - gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); + gbWidgetStyleLayout->setAlignment( TQt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); - cbStyle->setEditable( FALSE ); + cbStyle->setEditable( false ); hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); - pbConfigStyle->setEnabled( FALSE ); + pbConfigStyle->setEnabled( false ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); @@ -197,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) m_popupMenuDelay = new KIntNumInput(250, gbWidgetStyle); m_popupMenuDelay->setLabel(i18n("Menu popup delay:")); - m_popupMenuDelay->setRange(0, 5000, 50); + m_popupMenuDelay->setRange(0, 5000, 10); m_popupMenuDelay->setSuffix(i18n(" msec")); m_popupMenuDelay->setSteps(50, 50); gbWidgetStyleLayout->addWidget(m_popupMenuDelay); @@ -205,7 +203,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyleLayout->addSpacing(10); TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); - gbPreview->setColumnLayout( 0, Qt::Vertical ); + gbPreview->setColumnLayout( 0, TQt::Vertical ); gbPreview->layout()->setMargin( 0 ); gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); @@ -216,9 +214,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page1Layout->addWidget( gbPreview ); // Connect all required stuff - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) ); - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton())); - connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig())); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) ); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton())); + connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig())); // Add Page2 (Effects) // ------------------- @@ -229,7 +227,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout = new TQGridLayout( containerFrame, 1, 1, // rows, columns KDialog::marginHint(), KDialog::spacingHint() ); - comboComboEffect = new TQComboBox( FALSE, containerFrame ); + comboComboEffect = new TQComboBox( false, containerFrame ); comboComboEffect->insertItem( i18n("Disable") ); comboComboEffect->insertItem( i18n("Animate") ); lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame ); @@ -237,7 +235,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblComboEffect, 0, 0 ); containerLayout->addWidget( comboComboEffect, 0, 1 ); - comboTooltipEffect = new TQComboBox( FALSE, containerFrame ); + comboTooltipEffect = new TQComboBox( false, containerFrame ); comboTooltipEffect->insertItem( i18n("Disable") ); comboTooltipEffect->insertItem( i18n("Animate") ); comboTooltipEffect->insertItem( i18n("Fade") ); @@ -246,7 +244,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblTooltipEffect, 1, 0 ); containerLayout->addWidget( comboTooltipEffect, 1, 1 ); - comboRubberbandEffect = new TQComboBox( FALSE, containerFrame ); + comboRubberbandEffect = new TQComboBox( false, containerFrame ); comboRubberbandEffect->insertItem( i18n("Disable") ); comboRubberbandEffect->insertItem( i18n("Make translucent") ); lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame ); @@ -254,7 +252,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblRubberbandEffect, 2, 0 ); containerLayout->addWidget( comboRubberbandEffect, 2, 1 ); - comboMenuEffect = new TQComboBox( FALSE, containerFrame ); + comboMenuEffect = new TQComboBox( false, containerFrame ); comboMenuEffect->insertItem( i18n("Disable") ); comboMenuEffect->insertItem( i18n("Animate") ); comboMenuEffect->insertItem( i18n("Fade") ); @@ -264,7 +262,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblMenuEffect, 3, 0 ); containerLayout->addWidget( comboMenuEffect, 3, 1 ); - comboMenuHandle = new TQComboBox( FALSE, containerFrame ); + comboMenuHandle = new TQComboBox( false, containerFrame ); comboMenuHandle->insertItem( i18n("Disable") ); comboMenuHandle->insertItem( i18n("Application Level") ); // comboMenuHandle->insertItem( i18n("Enable") ); @@ -293,7 +291,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend ); - comboMenuEffectType = new TQComboBox( FALSE, menuContainer ); + comboMenuEffectType = new TQComboBox( false, menuContainer ); comboMenuEffectType->insertItem( i18n("Software Tint") ); comboMenuEffectType->insertItem( i18n("Software Blend") ); #ifdef HAVE_XRENDER @@ -304,7 +302,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) sliderBox = new TQVBox( menuContainer ); sliderBox->setSpacing( KDialog::spacingHint() ); sliderBox->setMargin( 0 ); - slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox ); + slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox ); slOpacity->setTickmarks( TQSlider::Below ); slOpacity->setTickInterval( 10 ); TQHBox* box1 = new TQHBox( sliderBox ); @@ -338,13 +336,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page2Layout->addItem( sp1 ); // Data flow stuff. - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) ); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) ); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) ); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) ); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffect, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); // Add Page3 (Miscellaneous) // ------------------------- @@ -355,7 +353,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() ); lbl = new TQLabel( i18n("Text pos&ition:"), dummy ); - comboToolbarIcons = new TQComboBox( FALSE, dummy ); + comboToolbarIcons = new TQComboBox( false, dummy ); comboToolbarIcons->insertItem( i18n("Icons Only") ); comboToolbarIcons->insertItem( i18n("Text Only") ); comboToolbarIcons->insertItem( i18n("Text Alongside Icons") ); @@ -379,29 +377,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) load(); // Do all the setDirty connections. - connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); // Page2 - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); - connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); - connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); + connect( comboTooltipEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboComboEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuHandle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); + connect( cbMenuShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); // Page1 & Page3 - connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty())); - connect( m_popupMenuDelay, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); + connect( cbHoverButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbEnableTooltips, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbIconsOnButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbTearOffHandles, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( comboToolbarIcons, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty())); + connect( m_popupMenuDelay, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); addWhatsThis(); @@ -479,9 +477,9 @@ void KCMStyle::styleSpecificConfig() dial->setMainWidget( pluginConfig ); //..and connect it to the wrapper - connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool))); - connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults())); - connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save())); + connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool))); + connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults())); + connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save())); if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) { // Force re-rendering of the preview, to apply settings @@ -670,12 +668,12 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); // Clean up m_bEffectsDirty = false; @@ -699,11 +697,11 @@ bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) if ( cbStyle->text(i) == name ) { combobox_item = i; - return TRUE; + return true; } } - return FALSE; + return false; } @@ -747,7 +745,7 @@ void KCMStyle::loadStyle( TDEConfig& config ) TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) ) continue; @@ -813,7 +811,7 @@ void KCMStyle::loadStyle( TDEConfig& config ) // they use QPopupMenus for the drop-down list! // ##### Since Trolltech likes to seemingly copy & paste code, - // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field. + // TQStringList::findItem() doesn't have a TQt::StringComparisonMode field. // We roll our own (yuck) cfgStyle = cfgStyle.lower(); int item = 0; @@ -851,7 +849,7 @@ void KCMStyle::styleChanged() void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb - if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) + if (!force && appliedStyle && appliedStyle->name() == styleName) return; // Create an instance of the new style... diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h index ecb8d4c7c..c9ff560f7 100644 --- a/kcontrol/style/kcmstyle.h +++ b/kcontrol/style/kcmstyle.h @@ -62,7 +62,7 @@ struct StyleEntry { class KCMStyle : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMStyle( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 7fa6ef698..17000c1d2 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) + TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) { return new KeramikStyleConfig(parent); } @@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); animateProgressBar->setChecked(origAnimProgressBar); - //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + //connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); } KeramikStyleConfig::~KeramikStyleConfig() diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h index 6de7edb10..d129b78f7 100644 --- a/kcontrol/style/keramik/keramikconf.h +++ b/kcontrol/style/keramik/keramikconf.h @@ -28,7 +28,7 @@ class TQCheckBox; class KeramikStyleConfig: public TQWidget { - Q_OBJECT + TQ_OBJECT public: KeramikStyleConfig(TQWidget* parent); ~KeramikStyleConfig(); diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 145ec465f..6d8514fc1 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -34,7 +34,7 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ) pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL) { setFixedSize(150, 150); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); mode = pvm; if (opacity < 0) opacity = 0; diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h index 6e1ad8b4c..1f496d15a 100644 --- a/kcontrol/style/menupreview.h +++ b/kcontrol/style/menupreview.h @@ -26,7 +26,7 @@ class KPixmap; class MenuPreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum PreviewMode { diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp index 8cb426b3f..feb5deba7 100644 --- a/kcontrol/style/styleconfdialog.cpp +++ b/kcontrol/style/styleconfdialog.cpp @@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase::Cancel) { m_dirty = false; - connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() )); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() )); + connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() )); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() )); } bool StyleConfigDialog::isDirty() const diff --git a/kcontrol/style/styleconfdialog.h b/kcontrol/style/styleconfdialog.h index 6555adee6..a9c5d26ef 100644 --- a/kcontrol/style/styleconfdialog.h +++ b/kcontrol/style/styleconfdialog.h @@ -26,7 +26,7 @@ class StyleConfigDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: StyleConfigDialog(TQWidget* parent, TQString styleName); diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index ed6d2e43a..6b2f2a51c 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -276,10 +276,10 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">stylepreview.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="10"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 6ea29b376..2d2128396 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -33,14 +33,14 @@ void StylePreview::init() { // Ensure that the user can't toy with the child widgets. // Method borrowed from Qt's qtconfig. - TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList* l = queryList("TQWidget"); TQObjectListIt it(*l); TQObject* obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } delete l; } @@ -59,9 +59,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev ) case TQEvent::Leave: case TQEvent::Wheel: case TQEvent::ContextMenu: - return TRUE; // ignore + return true; // ignore default: break; } - return FALSE; + return false; } diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 570544a72..0d6de4f0c 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -35,7 +35,7 @@ #include <kgenericfactory.h> #include <twin.h> #include <kcolorbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #define protected public @@ -192,15 +192,15 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_isGlobalConfig = true; } - connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals())); - connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration())); - connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); + connect(m_widget->globalConfigReload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadConfigurationFromGlobals())); + connect(m_widget->globalConfigEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditGlobalConfiguration())); + connect(m_widget->kcfg_UseGlobalSettings, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_widget->kcfg_SortByApp, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); @@ -222,10 +222,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL } m_widget->appearance->insertItem(i18n("Custom")); - connect(m_widget->appearance, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(appearanceChanged(int))); - connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(displayIconsNTextChanged(int))); + connect(m_widget->appearance, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(appearanceChanged(int))); + connect(m_widget->kcfg_DisplayIconsNText, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(displayIconsNTextChanged(int))); addConfig(m_settingsObject, m_widget); setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here." @@ -241,9 +241,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList()); m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList()); - connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdateComboBox())); - connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors())); + connect(m_widget->kcfg_GroupTasks, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdateComboBox())); + connect(m_widget->kcfg_UseCustomColors, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCustomColors())); slotUpdateCustomColors(); updateAppearanceCombo(); @@ -263,8 +263,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_widget->showAllScreens->show(); } - connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed())); - connect( m_widget->smallIcons, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( m_widget->showAllScreens, TQ_SIGNAL( stateChanged( int )), TQ_SLOT( changed())); + connect( m_widget->smallIcons, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"), I18N_NOOP("TDE Taskbar Control Module"), @@ -279,7 +279,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL load(); processLockouts(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } TaskbarConfig::~TaskbarConfig() @@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig() void TaskbarConfig::slotEditGlobalConfiguration() { TQByteArray data; - kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); } void TaskbarConfig::processLockouts() @@ -333,7 +333,7 @@ void TaskbarConfig::processLockouts() void TaskbarConfig::slotReloadConfigurationFromGlobals() { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); @@ -445,7 +445,7 @@ void TaskbarConfig::load() m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly()); int iconSize = m_settingsObject->iconSize(); - if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) + if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) { m_widget->smallIcons->setChecked(false); } @@ -457,11 +457,11 @@ void TaskbarConfig::save() if(m_widget->smallIcons->isChecked()) { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small)); } else { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel)); } m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked()); @@ -474,7 +474,7 @@ void TaskbarConfig::save() m_settingsObject->writeConfig(); TQByteArray data; - kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); + tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); } void TaskbarConfig::defaults() diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index 1a0860c69..a67386abf 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -52,7 +52,7 @@ class TaskbarAppearance class TaskbarConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TaskbarConfig(TQWidget *parent = 0, const char* name = 0, diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 920326f0a..1298677b6 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -156,10 +156,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts())); button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT @@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); - connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); + connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp())); if((act=itsDirOp->actionCollection()->action("home"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home())); if((act=itsDirOp->actionCollection()->action("back"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back())); if((act=itsDirOp->actionCollection()->action("forward"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward())); if((act=itsDirOp->actionCollection()->action("reload"))) act->plug(toolbar); @@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view")))) { - disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); - connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); + disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView())); + connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView())); itsIconAct->plug(toolbar); } if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) { - disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); - connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); + disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView())); + connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDeleteAct->plug(toolbar); itsDeleteAct->setEnabled(false); topMnu->insert(itsDeleteAct); - disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected())); - connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts())); + disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected())); + connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts())); } toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) && (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden"))) { - //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions())); - connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu())); + //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions())); + connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu())); setupViewMenu(); } @@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->dirLister()->setShowingDotFiles(true); - connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished())); - connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), - TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); - connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &))); - connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int))); + connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished())); + connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), + TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); + connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &))); + connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int))); } CKCmFontInst::~CKCmFontInst() @@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts() if(doIt) { TDEIO::DeleteJob *job = TDEIO::del(urls, false, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) } TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h index a5dccb161..8708ef1c0 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h @@ -58,7 +58,7 @@ namespace KFI class CKCmFontInst : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 559c8c4c5..e9f5b7dae 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); setDragEnabled(false); - connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); + connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); // DND - connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen())); + connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen())); setSelectionMode(KFileView::selectionMode()); itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this); } @@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item ) void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) { - disconnect(TQT_SIGNAL(selectionChanged()), this); - disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this); + disconnect(TQ_SIGNAL(selectionChanged()), this); + disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this); switch (sm) { @@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) // for highlighting if (KFile::Multi==sm || KFile::Extended==sm) - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); else - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * ))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * ))); } bool CKFileFontView::isSelected(const KFileItem *i) const diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h index 646359280..a741fead8 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h @@ -115,7 +115,7 @@ class CFontListViewItem : public TDEListViewItem */ class CKFileFontView : public TDEListView, public KFileView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 1956a34a6..987a44174 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b x=offset, y=offset; pix.resize(w, h); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter painter(&pix); @@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title); painter.setFont(TDEGlobalSettings::generalFont()); - painter.setPen(Qt::black); + painter.setPen(TQt::black); y=painter.fontMetrics().height(); drawText(painter, x, y, w-offset, title); y+=4; diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h index 535baa6e1..5db48b0c3 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.h +++ b/kcontrol/tdefontinst/lib/FcEngine.h @@ -45,7 +45,7 @@ typedef struct _XftFont XftFont; namespace KFI { -class KDE_EXPORT CFcEngine +class TDE_EXPORT CFcEngine { public: diff --git a/kcontrol/tdefontinst/lib/Misc.cpp b/kcontrol/tdefontinst/lib/Misc.cpp index 1a5952ce4..7f21abf0b 100644 --- a/kcontrol/tdefontinst/lib/Misc.cpp +++ b/kcontrol/tdefontinst/lib/Misc.cpp @@ -28,8 +28,8 @@ #include "Misc.h" #include <tqfile.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <klargefile.h> #include <tdeio/netaccess.h> #include <unistd.h> diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h index ee8de5445..3fd49d34a 100644 --- a/kcontrol/tdefontinst/lib/Misc.h +++ b/kcontrol/tdefontinst/lib/Misc.h @@ -50,25 +50,25 @@ namespace Misc DIR_PERMS = 0755 }; - extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); - inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } - inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } - inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } - inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } - inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } - extern KDE_EXPORT TQString linkedTo(const TQString &i); - extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ - extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path - inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } - extern KDE_EXPORT TQString getDir(const TQString &f); - extern KDE_EXPORT TQString getFile(const TQString &f); - extern KDE_EXPORT bool createDir(const TQString &dir); - extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); - extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); - inline KDE_EXPORT bool root() { return 0==getuid(); } - extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); - extern KDE_EXPORT void createBackup(const TQString &f); - extern KDE_EXPORT time_t getTimeStamp(const TQString &item); + extern TDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); + inline TDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } + inline TDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } + inline TDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } + inline TDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } + inline TDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } + extern TDE_EXPORT TQString linkedTo(const TQString &i); + extern TDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ + extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path + inline TDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } + extern TDE_EXPORT TQString getDir(const TQString &f); + extern TDE_EXPORT TQString getFile(const TQString &f); + extern TDE_EXPORT bool createDir(const TQString &dir); + extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); + extern TDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); + inline TDE_EXPORT bool root() { return 0==getuid(); } + extern TDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); + extern TDE_EXPORT void createBackup(const TQString &f); + extern TDE_EXPORT time_t getTimeStamp(const TQString &item); } } diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 54de7bdcf..753e412cd 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -52,15 +52,15 @@ #include <tqtextstream.h> #include <kmimetype.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klargefile.h> #include <tdetempfile.h> #include <tdesu/su.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <ktar.h> #include <kxftconfig.h> @@ -97,7 +97,7 @@ static const int constMaxFcCheckTime=10; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp index a053393f4..c7c00ef0f 100644 --- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new KFI::CFontThumbnail; } diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index 41367d586..7b5a7a5bf 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp @@ -65,7 +65,7 @@ void CFontPreview::showFont() if(!itsCurrentUrl.isEmpty() && itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false)) { - setEraseColor(Qt::white); + setEraseColor(TQt::white); update(); emit status(true); } @@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *) { if(!itsCurrentUrl.isEmpty()) { - paint.setPen(kapp->palette().active().text()); + paint.setPen(tdeApp->palette().active().text()); paint.drawText(rect(), AlignCenter, i18n(" No preview available")); } } diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h index 71916479e..f6ebd8dbd 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.h +++ b/kcontrol/tdefontinst/viewpart/FontPreview.h @@ -42,7 +42,7 @@ namespace KFI class CFontPreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index e31510ad3..b3f3b1c94 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> @@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); itsFrame->setFrameShape(TQFrame::NoFrame); - itsFrame->setFocusPolicy(TQ_ClickFocus); + itsFrame->setFocusPolicy(TQWidget::ClickFocus); itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); @@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); - connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); - connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); + connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool))); + connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install())); + connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int))); itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(), - this, TQT_SLOT(changeText()), actionCollection(), "changeText"); + this, TQ_SLOT(changeText()), actionCollection(), "changeText"); itsChangeTextAction->setEnabled(false); - itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); + itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print"); itsPrintAction->setEnabled(false); setXMLFile("tdefontviewpart.rc"); @@ -143,7 +143,7 @@ bool CFontViewPart::openFile() { // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up. // Bug report 111535 indicates that calling "konqueror <font>" crashes. - TQTimer::singleShot(0, this, TQT_SLOT(timeout())); + TQTimer::singleShot(0, this, TQ_SLOT(timeout())); return true; } diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h index 24f6d8d8b..62a380f85 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.h +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h @@ -45,7 +45,7 @@ class CFontPreview; class CFontViewPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index a43f9d1d2..a2ea58602 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -30,12 +30,12 @@ #include "FontViewPart.h" #include <kdebug.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> extern "C" { - KDE_EXPORT void* init_libtdefontviewpart() + TDE_EXPORT void* init_libtdefontviewpart() { TDEGlobal::locale()->insertCatalogue("tdefontinst"); return new KFI::CFontViewPartFactory; diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h index 7ac96e9c8..a584d0888 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h @@ -39,13 +39,13 @@ namespace KFI class CFontViewPartFactory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: CFontViewPartFactory(); virtual ~CFontViewPartFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); static TDEInstance * instance(); diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index df1fa92d2..057b54831 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; @@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview->openURL(openURL); TQSize defSize(450, 380); - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); - resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); + resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); show(); } else @@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() CFontViewerAppMainWindow::~CFontViewerAppMainWindow() { - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); - kapp->config()->writeEntry(CFG_SIZE_KEY, size()); - kapp->config()->sync(); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); + tdeApp->config()->writeEntry(CFG_SIZE_KEY, size()); + tdeApp->config()->sync(); } void CFontViewerAppMainWindow::fileOpen() diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h index cc9a5981b..3b297a197 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h @@ -38,7 +38,7 @@ namespace KFI class CFontViewerAppMainWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO index a592d4b57..b96168964 100644 --- a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO +++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO @@ -29,7 +29,7 @@ NEW PROPERTIES: =============== X-TDE-UA-TAG FIELD: REQUIRED -TYPE: QString +TYPE: TQString TRANSLATE: NO DESCRIPTION: An abbreviation of the actual browser-brand and is used @@ -42,7 +42,7 @@ actual user-agent name (X-TDE-UA-NAME). X-TDE-UA-FULL FIELD: REQUIRED -TYPE: QString +TYPE: TQString TRANSLATE: NO DESCRIPTION: The full user-agent description that will be sent to the remote @@ -62,21 +62,21 @@ and set its value to 1 (for true). X-TDE-UA-NAME FIELD: REQUIRED -TYPE: QString +TYPE: TQString TRANSLATE: YES DESCRIPTION: The actual name of the browser or user-agent. X-TDE-UA-VERSION FIELD: REQUIRED -TYPE: QString +TYPE: TQString TRANSLATE: YES DESCRIPTION: The actual version of the browser or user-agent. X-TDE-UA-SYSNAME FIELD: OPTIONAL -TYPE: QString +TYPE: TQString TRANSLATE: YES DESCRIPTION: The system name (for example Linux) where the browser @@ -84,7 +84,7 @@ identification was obtained from. X-TDE-UA-SYSRELEASE FIELD: OPTIONAL -TYPE: QString +TYPE: TQString TRANSLATE: YES DESCRIPTION: The system version (for example 2.4.1) where the browser diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp index 42c0fc28f..b05f11b47 100644 --- a/kcontrol/tdeio/cache.cpp +++ b/kcontrol/tdeio/cache.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <knuminput.h> #include "ksaveioconfig.h" @@ -66,10 +66,10 @@ void KCacheConfigDialog::load() m_dlg->rbCacheIfPossible->setChecked( true ); // Config changed notifications... - connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) ); + connect ( m_dlg->cbUseCache, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->bgCachePolicy, TQ_SIGNAL(clicked (int)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->sbMaxCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->pbClearCache, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearCache()) ); emit changed( false ); } diff --git a/kcontrol/tdeio/cache.h b/kcontrol/tdeio/cache.h index 03a4d0581..7adb3c0b8 100644 --- a/kcontrol/tdeio/cache.h +++ b/kcontrol/tdeio/cache.h @@ -28,7 +28,7 @@ class CacheDlgUI; class KCacheConfigDialog : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCacheConfigDialog( TQWidget* parent = 0 ); diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp index b48d19738..b31645574 100644 --- a/kcontrol/tdeio/fakeuaprovider.cpp +++ b/kcontrol/tdeio/fakeuaprovider.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "fakeuaprovider.h" diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp index 9869c6c92..10ed75d26 100644 --- a/kcontrol/tdeio/kcookiesmain.cpp +++ b/kcontrol/tdeio/kcookiesmain.cpp @@ -46,7 +46,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent) tab->addTab(policies, i18n("&Policy")); policiesTabNumber = currentTabNumber; currentTabNumber++; - connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(policies, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); if( managerOK ) { @@ -54,7 +54,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent) tab->addTab(management, i18n("&Management")); managementTabNumber = currentTabNumber; currentTabNumber++; - connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(management, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); } } diff --git a/kcontrol/tdeio/kcookiesmain.h b/kcontrol/tdeio/kcookiesmain.h index 99591c8ad..42a74c2ee 100644 --- a/kcontrol/tdeio/kcookiesmain.h +++ b/kcontrol/tdeio/kcookiesmain.h @@ -15,7 +15,7 @@ class KCookiesManagement; class KCookiesMain : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCookiesMain(TQWidget *parent = 0L); ~KCookiesMain(); diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp index 1a9314d91..e3737ff6b 100644 --- a/kcontrol/tdeio/kcookiesmanagement.cpp +++ b/kcontrol/tdeio/kcookiesmanagement.cpp @@ -114,15 +114,15 @@ KCookiesManagement::KCookiesManagement(TQWidget *parent) mainLayout->addWidget(dlg); dlg->lvCookies->setSorting(0); - connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) ); - connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) ); + connect(dlg->lvCookies, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(getCookies(TQListViewItem*)) ); + connect(dlg->lvCookies, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(showCookieDetails(TQListViewItem*)) ); - connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie())); - connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies())); - connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains())); - connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy())); + connect(dlg->pbDelete, TQ_SIGNAL(clicked()), TQ_SLOT(deleteCookie())); + connect(dlg->pbDeleteAll, TQ_SIGNAL(clicked()), TQ_SLOT(deleteAllCookies())); + connect(dlg->pbReload, TQ_SIGNAL(clicked()), TQ_SLOT(getDomains())); + connect(dlg->pbPolicy, TQ_SIGNAL(clicked()), TQ_SLOT(doPolicy())); - connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy())); + connect(dlg->lvCookies, TQ_SIGNAL(doubleClicked (TQListViewItem *)), TQ_SLOT(doPolicy())); deletedCookies.setAutoDelete(true); m_bDeleteAll = false; mainWidget = parent; diff --git a/kcontrol/tdeio/kcookiesmanagement.h b/kcontrol/tdeio/kcookiesmanagement.h index 51e31fbee..ffd5c034d 100644 --- a/kcontrol/tdeio/kcookiesmanagement.h +++ b/kcontrol/tdeio/kcookiesmanagement.h @@ -61,7 +61,7 @@ private: class KCookiesManagement : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCookiesManagement(TQWidget *parent = 0 ); diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp index a39773cf1..6febd106e 100644 --- a/kcontrol/tdeio/kcookiespolicies.cpp +++ b/kcontrol/tdeio/kcookiespolicies.cpp @@ -323,40 +323,40 @@ void KCookiesPolicies::load() } // Connect the main swicth :) Enable/disable cookie support - connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( cookiesEnabled(bool) ) ); - connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( configChanged() ) ); + connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( cookiesEnabled(bool) ) ); + connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( configChanged() ) ); // Connect the preference check boxes... - connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()), - TQT_SLOT(configChanged())); - connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(configChanged())); - connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(configChanged())); - - connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(autoAcceptSessionCookies(bool))); - connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(ignoreCookieExpirationDate(bool))); + connect ( dlg->cbRejectCrossDomainCookies, TQ_SIGNAL(clicked()), + TQ_SLOT(configChanged())); + connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(configChanged())); + connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(configChanged())); + + connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(autoAcceptSessionCookies(bool))); + connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(ignoreCookieExpirationDate(bool))); // Connect the default cookie policy radio buttons... - connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged())); + connect(dlg->bgDefault, TQ_SIGNAL(clicked(int)), TQ_SLOT(configChanged())); // Connect signals from the domain specific policy listview. - connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)), - TQT_SLOT(changePressed() ) ); - connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )), - TQT_SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(doubleClicked (TQListViewItem *)), + TQ_SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(returnPressed ( TQListViewItem * )), + TQ_SLOT(changePressed() ) ); // Connect the buttons... - connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); - connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); } void KCookiesPolicies::save() diff --git a/kcontrol/tdeio/kcookiespolicies.h b/kcontrol/tdeio/kcookiespolicies.h index 50ce7a62b..e0af0fc43 100644 --- a/kcontrol/tdeio/kcookiespolicies.h +++ b/kcontrol/tdeio/kcookiespolicies.h @@ -38,7 +38,7 @@ class KCookiesPolicyDlgUI; class KCookiesPolicies : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCookiesPolicies(TQWidget *parent = 0); diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp index e8d1c0e47..2a8b348c7 100644 --- a/kcontrol/tdeio/kenvvarproxydlg.cpp +++ b/kcontrol/tdeio/kenvvarproxydlg.cpp @@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init() { m_bHasValidData = false; - connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) ); - connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) ); - connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) ); + connect( mDlg->cbShowValue, TQ_SIGNAL( clicked() ), TQ_SLOT( showValuePressed() ) ); + connect( mDlg->pbVerify, TQ_SIGNAL( clicked() ), TQ_SLOT( verifyPressed() ) ); + connect( mDlg->pbDetect, TQ_SIGNAL( clicked() ), TQ_SLOT( autoDetectPressed() ) ); } void KEnvVarProxyDlg::setProxyData( const KProxyData& data ) diff --git a/kcontrol/tdeio/kenvvarproxydlg.h b/kcontrol/tdeio/kenvvarproxydlg.h index 3ddbc989f..092ae4526 100644 --- a/kcontrol/tdeio/kenvvarproxydlg.h +++ b/kcontrol/tdeio/kenvvarproxydlg.h @@ -29,7 +29,7 @@ class EnvVarProxyDlgUI; class KEnvVarProxyDlg : public KProxyDialogBase { - Q_OBJECT + TQ_OBJECT public: KEnvVarProxyDlg( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index 01d2b584c..0d785025d 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -63,19 +63,19 @@ void KManualProxyDlg::init() mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE ); mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE ); - connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) ); - connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( mDlg->pbNew, TQ_SIGNAL( clicked() ), TQ_SLOT( newPressed() ) ); + connect( mDlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( mDlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( mDlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); - connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed())); + connect( mDlg->lbExceptions, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mDlg->lbExceptions, TQ_SIGNAL(doubleClicked (TQListBoxItem *)), TQ_SLOT(changePressed())); - connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) ); - connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) ); + connect( mDlg->cbSameProxy, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( sameProxy(bool) ) ); + connect( mDlg->pbCopyDown, TQ_SIGNAL( clicked() ), TQ_SLOT( copyDown() ) ); - connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) ); + connect( mDlg->leHttp, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( mDlg->sbHttp, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChanged (int)) ); } void KManualProxyDlg::setProxyData( const KProxyData &data ) diff --git a/kcontrol/tdeio/kmanualproxydlg.h b/kcontrol/tdeio/kmanualproxydlg.h index 18cbd6f0a..0c59f53ff 100644 --- a/kcontrol/tdeio/kmanualproxydlg.h +++ b/kcontrol/tdeio/kmanualproxydlg.h @@ -30,7 +30,7 @@ class ManualProxyDlgUI; class KManualProxyDlg : public KProxyDialogBase { - Q_OBJECT + TQ_OBJECT public: KManualProxyDlg( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp index 9253916d7..344392b91 100644 --- a/kcontrol/tdeio/kproxydlg.cpp +++ b/kcontrol/tdeio/kproxydlg.cpp @@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (TQWidget* parent ) mTab->addTab(mProxy, i18n("&Proxy")); mTab->addTab(mSocks, i18n("&SOCKS")); - connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged())); + connect(mProxy, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(mSocks, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(mTab, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SIGNAL(quickHelpChanged())); } KProxyOptions::~KProxyOptions() @@ -121,27 +121,27 @@ KProxyDialog::KProxyDialog( TQWidget* parent) mainLayout->addStretch(); // signals and slots connections - connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotUseProxyChanged() ) ); + connect( mDlg->rbNoProxy, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotUseProxyChanged() ) ); - connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); - connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbAutoDiscover, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); + connect( mDlg->rbAutoScript, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); - connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbPrompt, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); + connect( mDlg->rbPresetLogin, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->cbPersConn, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->location, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) ); - connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) ); + connect( mDlg->pbEnvSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupEnvProxy() ) ); + connect( mDlg->pbManSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupManProxy() ) ); load(); } diff --git a/kcontrol/tdeio/kproxydlg.h b/kcontrol/tdeio/kproxydlg.h index d70921ef9..b6718584e 100644 --- a/kcontrol/tdeio/kproxydlg.h +++ b/kcontrol/tdeio/kproxydlg.h @@ -33,7 +33,7 @@ class KProxyDialogUI; class KProxyOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KProxyOptions( TQWidget* parent = 0 ); @@ -54,7 +54,7 @@ private: class KProxyDialog : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KProxyDialog( TQWidget* parent = 0 ); diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp index c0770af9e..7000f2542 100644 --- a/kcontrol/tdeio/main.cpp +++ b/kcontrol/tdeio/main.cpp @@ -40,37 +40,37 @@ extern "C" { - KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/) { return new KCookiesMain(parent); } - KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/) { return new SMBRoOptions(parent); } - KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/) { return new UserAgentDlg(parent); } - KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/) { return new KProxyOptions(parent); } - KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/) { return new KCacheConfigDialog( parent ); } - KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/) { return new KIOPreferences(parent); } - KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *) { return new LanBrowser(parent); } @@ -110,7 +110,7 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(smbPage, i18n("&Windows Shares")); smbPageTabNumber = currentTabNumber; currentTabNumber++; - connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() )); + connect(smbPage,TQ_SIGNAL(changed(bool)), TQ_SLOT( changed() )); lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs); if (lisaPage) @@ -118,14 +118,14 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(lisaPage,i18n("&LISa Daemon")); lisaPageTabNumber = currentTabNumber; currentTabNumber++; - connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(lisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); } // resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs); // if (resLisaPage) // { // tabs.addTab(resLisaPage,i18n("R&esLISa Daemon")); -// connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); +// connect(resLisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); // } tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan", TDECModuleLoader::None, &tabs); @@ -134,7 +134,7 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve")); tdeioLanPageTabNumber = currentTabNumber; currentTabNumber++; - connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(tdeioLanPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); } setButtons(Apply|Help); diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h index 2fed35123..7963c1321 100644 --- a/kcontrol/tdeio/main.h +++ b/kcontrol/tdeio/main.h @@ -28,7 +28,7 @@ class TQTabWidget; class LanBrowser : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LanBrowser(TQWidget *parent=0); virtual void load(); diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp index acde5635e..2cf465977 100644 --- a/kcontrol/tdeio/netpref.cpp +++ b/kcontrol/tdeio/netpref.cpp @@ -29,29 +29,29 @@ KIOPreferences::KIOPreferences( TQWidget* parent ) sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" ); sb_socketRead->setSuffix( i18n( " sec" ) ); sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter); - connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_socketRead, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout, 10, "sb_proxyConnect" ); sb_proxyConnect->setSuffix( i18n( " sec" ) ); sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter); - connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_proxyConnect, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout, 10, "sb_serverConnect" ); sb_serverConnect->setSuffix( i18n( " sec" ) ); sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter); - connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_serverConnect, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout, 10, "sb_serverResponse" ); sb_serverResponse->setSuffix( i18n( " sec" ) ); sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter); - connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_serverResponse, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" ); cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp ); @@ -64,8 +64,8 @@ KIOPreferences::KIOPreferences( TQWidget* parent ) mainLayout->addWidget( gb_Ftp ); - connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); - connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); + connect(cb_ftpEnablePasv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); + connect(cb_ftpMarkPartial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); mainLayout->addStretch(); diff --git a/kcontrol/tdeio/netpref.h b/kcontrol/tdeio/netpref.h index 30584a598..fd423df5b 100644 --- a/kcontrol/tdeio/netpref.h +++ b/kcontrol/tdeio/netpref.h @@ -14,7 +14,7 @@ class KIntNumInput; class KIOPreferences : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KIOPreferences( TQWidget* parent = 0); diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp index c45dd837e..77c818cf2 100644 --- a/kcontrol/tdeio/policydlg.cpp +++ b/kcontrol/tdeio/policydlg.cpp @@ -63,12 +63,12 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI = new PolicyDlgUI (this); setMainWidget(m_dlgUI); - m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain))); + m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain)); m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); - connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_dlgUI->leDomain, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); diff --git a/kcontrol/tdeio/policydlg.h b/kcontrol/tdeio/policydlg.h index 2bf7a4c99..cd291998e 100644 --- a/kcontrol/tdeio/policydlg.h +++ b/kcontrol/tdeio/policydlg.h @@ -65,7 +65,7 @@ public: class PolicyDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PolicyDlg (const TQString& caption, TQWidget *parent = 0, diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp index ccb070e33..4df8ff396 100644 --- a/kcontrol/tdeio/smbrodlg.cpp +++ b/kcontrol/tdeio/smbrodlg.cpp @@ -73,11 +73,11 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) layout->addWidget(new TQWidget(this),4,0); -// connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); - connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); -// connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); -// connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) ); +// connect(m_showHiddenShares, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_userLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); + connect(m_passwordLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); +// connect(m_workgroupLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); +// connect( m_encodingList, TQ_SIGNAL( activated( const TQString & ) ), this , TQ_SLOT( changed() ) ); layout->setRowStretch(4, 1); diff --git a/kcontrol/tdeio/smbrodlg.h b/kcontrol/tdeio/smbrodlg.h index 1c9d0347d..73c513efa 100644 --- a/kcontrol/tdeio/smbrodlg.h +++ b/kcontrol/tdeio/smbrodlg.h @@ -31,7 +31,7 @@ class KComboBox; class SMBRoOptions : public TDECModule { - Q_OBJECT + TQ_OBJECT public: SMBRoOptions(TQWidget *parent = 0); ~SMBRoOptions(); diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index 91d8cfd5c..40dbf24dd 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/kcontrol/tdeio/socks.cpp @@ -52,26 +52,26 @@ KSocksConfig::KSocksConfig(TQWidget *parent) base = new SocksBase(this); layout->add(base); - connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int))); + connect(base->_c_enableSocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(base->bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(methodChanged(int))); // The custom library - connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(customPathChanged(const TQString&))); + connect(base->_c_customPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_customPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(customPathChanged(const TQString&))); // Additional libpaths - connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(addThisLibrary(const TQString&))); - connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(libTextChanged(const TQString&))); - connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary())); - connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary())); - connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection())); + connect(base->_c_newPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_newPath, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(addThisLibrary(const TQString&))); + connect(base->_c_newPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(libTextChanged(const TQString&))); + connect(base->_c_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(addLibrary())); + connect(base->_c_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeLibrary())); + connect(base->_c_libs, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(libSelection())); // The "Test" button - connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked())); + connect(base->_c_test, TQ_SIGNAL(clicked()), this, TQ_SLOT(testClicked())); // The config backend load(); @@ -194,7 +194,7 @@ void KSocksConfig::libSelection() void KSocksConfig::load() { - TDEConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(tdeApp->config(), "Socks"); base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false)); int id = config.readNumEntry("SOCKS_method", 1); base->bg->setButton(id); @@ -228,7 +228,7 @@ void KSocksConfig::load() void KSocksConfig::save() { - TDEConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(tdeApp->config(), "Socks"); config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true); config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true); config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true); @@ -241,7 +241,7 @@ void KSocksConfig::save() } config.writePathEntry("SOCKS_lib_path", libs, ',', true, true); - kapp->config()->sync(); + tdeApp->config()->sync(); emit changed(false); } diff --git a/kcontrol/tdeio/socks.h b/kcontrol/tdeio/socks.h index f5c5cb2a4..eac39becc 100644 --- a/kcontrol/tdeio/socks.h +++ b/kcontrol/tdeio/socks.h @@ -35,7 +35,7 @@ class TQVButtonGroup; class KSocksConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KSocksConfig(TQWidget *parent); virtual ~KSocksConfig(); diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp index 5e5cbd233..430261a45 100644 --- a/kcontrol/tdeio/uagentproviderdlg.cpp +++ b/kcontrol/tdeio/uagentproviderdlg.cpp @@ -45,8 +45,8 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) { int key = e->key(); TQString keycode = e->text(); - if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || - (cursorPosition() > 0 && key == Qt::Key_Minus) || + if ( (key >= TQt::Key_Escape && key <= TQt::Key_Help) || key == TQt::Key_Period || + (cursorPosition() > 0 && key == TQt::Key_Minus) || (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); @@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg() void UAProviderDlg::init() { - connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( dlg->pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( dlg->pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); - connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged( const TQString&)) ); + connect( dlg->leSite, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged( const TQString&)) ); - connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotActivated(const TQString&)) ); + connect( dlg->cbAlias, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotActivated(const TQString&)) ); dlg->cbAlias->clear(); dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() ); diff --git a/kcontrol/tdeio/uagentproviderdlg.h b/kcontrol/tdeio/uagentproviderdlg.h index 3e60edb54..acab34674 100644 --- a/kcontrol/tdeio/uagentproviderdlg.h +++ b/kcontrol/tdeio/uagentproviderdlg.h @@ -29,7 +29,7 @@ class UAProviderDlgUI; class UALineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: UALineEdit( TQWidget *parent, const char *name=0 ); @@ -40,7 +40,7 @@ protected: class UAProviderDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: UAProviderDlg( const TQString& caption, TQWidget *parent = 0, diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp index 7b1f4b3d7..9bab933b8 100644 --- a/kcontrol/tdeio/useragentdlg.cpp +++ b/kcontrol/tdeio/useragentdlg.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <tdelistview.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeio/http_slave_defaults.h> #include "ksaveioconfig.h" @@ -56,22 +56,22 @@ UserAgentDlg::UserAgentDlg( TQWidget * parent ) dlg->lvDomainPolicyList->setSorting(0); - connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); + connect( dlg->cbSendUAString, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); - connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)), - TQT_SLOT(changeDefaultUAModifiers(int))); + connect( dlg->gbDefaultId, TQ_SIGNAL(clicked(int)), + TQ_SLOT(changeDefaultUAModifiers(int))); - connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)), - TQT_SLOT(changePressed()) ); - connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ), - TQT_SLOT( changePressed() )); + connect( dlg->lvDomainPolicyList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicyList, TQ_SIGNAL(doubleClicked (TQListViewItem *)), + TQ_SLOT(changePressed()) ); + connect( dlg->lvDomainPolicyList, TQ_SIGNAL( returnPressed ( TQListViewItem * ) ), + TQ_SLOT( changePressed() )); - connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); - connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); load(); } @@ -186,7 +186,7 @@ void UserAgentDlg::save() if (!deleteList.isEmpty()) { // Remove entries from local file. - KSimpleConfig cfg("tdeio_httprc"); + TDESimpleConfig cfg("tdeio_httprc"); for ( TQStringList::Iterator it = deleteList.begin(); it != deleteList.end(); ++it ) { diff --git a/kcontrol/tdeio/useragentdlg.h b/kcontrol/tdeio/useragentdlg.h index 746a8524a..ca65b2df3 100644 --- a/kcontrol/tdeio/useragentdlg.h +++ b/kcontrol/tdeio/useragentdlg.h @@ -33,7 +33,7 @@ class UserAgentDlgUI; class UserAgentDlg : public TDECModule { - Q_OBJECT + TQ_OBJECT public: UserAgentDlg ( TQWidget * parent = 0) ; diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp index 832940d7d..efeb6b088 100644 --- a/kcontrol/tdm/background.cpp +++ b/kcontrol/tdm/background.cpp @@ -34,10 +34,10 @@ #include "../background/bgdialog.h" #include "background.h" #include <tqcheckbox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialog.h> -extern KSimpleConfig *config; +extern TDESimpleConfig *config; KBackground::KBackground(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -51,17 +51,17 @@ KBackground::KBackground(TQWidget *parent, const char *name) " This is done by running some program (possibly xsetroot) in the script" " specified in the Setup= option in tdmrc (usually Xsetup).") ); config->setGroup( "X-*-Greeter" ); - m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) ); + m_simpleConf=new TDESimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) ); m_background = new BGDialog( this, m_simpleConf, false ); - connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); // Top layout TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); top->addStretch(); - connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) ); + connect( m_pCBEnable, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotEnableChanged()) ); } KBackground::~KBackground() diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h index ad708d485..a15377784 100644 --- a/kcontrol/tdm/background.h +++ b/kcontrol/tdm/background.h @@ -14,7 +14,7 @@ #include <tqwidget.h> -class KSimpleConfig; +class TDESimpleConfig; class BGDialog; class TDEGlobalBackgroundSettings; class TQCheckBox; @@ -22,7 +22,7 @@ class TQLabel; class KBackground: public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBackground(TQWidget *parent=0, const char *name=0); ~KBackground(); @@ -42,7 +42,7 @@ private: TQCheckBox *m_pCBEnable; TQLabel *m_pMLabel; - KSimpleConfig *m_simpleConf; + TDESimpleConfig *m_simpleConf; BGDialog *m_background; }; diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 2a5f72895..fdba26c5d 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -76,7 +76,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) return 0; } -KSimpleConfig *config; +TDESimpleConfig *config; TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(TDMFactory::instance(), parent, name) @@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) TQMap<gid_t,TQStringList> tgmap; TQMap<gid_t,TQStringList>::Iterator tgmapi; TQMap<gid_t,TQStringList>::ConstIterator tgmapci; - TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi; + TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi; struct passwd *ps; for (setpwent(); (ps = getpwent()); ) { TQString un( TQFile::decodeName( ps->pw_name ) ); if (usermap.find( un ) == usermap.end()) { - usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) ); + usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) ); if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end()) (*tgmapi).append( un ); else @@ -175,10 +175,10 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) struct stat st; if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) { - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" )); } else { - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" )); } TQVBoxLayout *top = new TQVBoxLayout(this); @@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) appearance = new TDMAppearanceWidget(this); tab->addTab(appearance, i18n("A&ppearance")); - connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); + connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool))); font = new TDMFontWidget(this); tab->addTab(font, i18n("&Font")); - connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); background = new KBackground(this); tab->addTab(background, i18n("&Background")); - connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); sessions = new TDMSessionsWidget(this); tab->addTab(sessions, i18n("&Shutdown")); - connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); users = new TDMUsersWidget(this, 0); tab->addTab(users, i18n("&Users")); - connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers())); + connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers())); convenience = new TDMConvenienceWidget(this, 0); tab->addTab(convenience, i18n("Con&venience")); - connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers())); + connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers())); load(); if (getuid() != 0 || !config->checkConfigFilesWritable( true )) { @@ -298,7 +298,7 @@ void TDModule::propagateUsers() groupmap.clear(); emit clearUsers(); TQMap<TQString,int> lusers; - TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQMapConstIterator<TQString, TQPair<int,TQStringList> > it; TQStringList::ConstIterator jt; TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { @@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max) { if (updateOK) { TQMap<TQString,int> alusers, dlusers; - TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQMapConstIterator<TQString, TQPair<int,TQStringList> > it; TQStringList::ConstIterator jt; TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index 48cfa5b22..4274e8323 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -38,7 +38,7 @@ class KBackground; class TDModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ private: TDMUsersWidget *users; TDMConvenienceWidget *convenience; - TQMap<TQString, QPair<int,TQStringList> > usermap; + TQMap<TQString, TQPair<int,TQStringList> > usermap; TQMap<TQString,int> groupmap; int minshowuid, maxshowuid; bool updateOK; diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 8e49087d1..c057867d1 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -40,7 +40,7 @@ #include <kimageio.h> #include <kcombobox.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <kiconloader.h> #include <kurldrag.h> @@ -51,7 +51,7 @@ #include "config.h" -extern KSimpleConfig *config; +extern TDESimpleConfig *config; #define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock" @@ -76,8 +76,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) greetstr_lined = new KLineEdit(group); TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group); hlay->addWidget(label); - connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(greetstr_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); hlay->addWidget(greetstr_lined); wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to " "put some nice greeting or information about the operating system here.<p>" @@ -107,8 +107,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) logoRadio = new TQRadioButton( i18n("Sho&w logo"), group ); TQButtonGroup *buttonGroup = new TQButtonGroup( group ); label->setBuddy( buttonGroup ); - connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) ); - connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) ); + connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotAreaRadioClicked(int)) ); + connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()) ); buttonGroup->hide(); buttonGroup->insert(noneRadio, KdmNone); buttonGroup->insert(clockRadio, KdmClock); @@ -128,9 +128,9 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) logobutton->setAutoDefault(false); logobutton->setAcceptDrops(true); logobutton->installEventFilter(this); // for drag and drop - connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked())); + connect(logobutton, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogoButtonClicked())); hglay->addWidget(logoLabel, 1, 0); - hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter); + hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter); hglay->addRowSpacing(1, 110); wtstr = i18n("Click here to choose an image that TDM will display. " "You can also drag and drop an image onto this button " @@ -145,19 +145,19 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) grid->addLayout(hglay, 2, 1); label = new TQLabel(i18n("Position:"), group); - hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter); - TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group)); + hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter); + TQValidator *posValidator = new TQIntValidator(0, 100, group); TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group); hglay->addWidget(xLineLabel, 0, 1); xLineEdit = new TQLineEdit (group); - connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); + connect( xLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() )); hglay->addWidget(xLineEdit, 0, 2); xLineLabel->setBuddy(xLineEdit); xLineEdit->setValidator(posValidator); TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group); hglay->addWidget(yLineLabel, 1, 1); yLineEdit = new TQLineEdit (group); - connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); + connect( yLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() )); hglay->addWidget(yLineEdit, 1, 2); yLineLabel->setBuddy(yLineEdit); yLineEdit->setValidator(posValidator); @@ -179,7 +179,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) compositorcombo->insertItem( "", i18n("None") ); compositorcombo->insertItem( TDE_COMPOSITOR_BINARY, i18n("Trinity compositor") ); label = new TQLabel(compositorcombo, i18n("Compositor:"), group); - connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(compositorcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 0, 0); hglay->addWidget(compositorcombo, 0, 1); wtstr = i18n("Choose a compositor to be used in TDM. Note that the chosen compositor will continue to run after login."); @@ -191,7 +191,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) loadGuiStyles(guicombo); guicombo->listBox()->sort(); label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group); - connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(guicombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 1, 0); hglay->addWidget(guicombo, 1, 1); wtstr = i18n("You can choose a basic GUI style here that will be " @@ -204,7 +204,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) loadColorSchemes(colcombo); colcombo->listBox()->sort(); label = new TQLabel(colcombo, i18n("&Color scheme:"), group); - connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(colcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 2, 0); hglay->addWidget(colcombo, 2, 1); wtstr = i18n("You can choose a basic Color Scheme here that will be " @@ -217,7 +217,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) echocombo->insertItem("OneStar", i18n("One Star")); echocombo->insertItem("ThreeStars", i18n("Three Stars")); label = new TQLabel(echocombo, i18n("Echo &mode:"), group); - connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(echocombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 3, 0); hglay->addWidget(echocombo, 3, 1); wtstr = i18n("You can choose whether and how TDM shows your password when you type it."); @@ -226,12 +226,12 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) // The Language group box - group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this); + group = new TQGroupBox(0, TQt::Vertical, i18n("Locale"), this); vbox->addWidget(group); langcombo = new KLanguageButton(group); loadLanguageList(langcombo); - connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(langcombo, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); label = new TQLabel(langcombo, i18n("Languag&e:"), group); TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); @@ -243,11 +243,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) TQWhatsThis::add( langcombo, wtstr ); // The SAK group box - group = new TQGroupBox(0, Qt::Vertical, i18n("Secure Attention Key"), this); + group = new TQGroupBox(0, TQt::Vertical, i18n("Secure Attention Key"), this); vbox->addWidget(group); sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group ); - connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( sakbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox2->setColStretch(1, 1); hbox2->addWidget(sakbox, 1, 0); @@ -262,11 +262,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) TQWhatsThis::add( sakbox, wtstr ); // Keyboard group box - group = new TQGroupBox(0, Qt::Vertical, i18n("Keyboard"), this); + group = new TQGroupBox(0, TQt::Vertical, i18n("Keyboard"), this); vbox->addWidget(group); kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group); - connect(kbdledbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(kbdledbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQGridLayout *hbox3 = new TQGridLayout(group->layout(), 2, 2, KDialog::spacingHint()); hbox3->setColStretch(1, 1); hbox3->addWidget(kbdledbox, 1, 0); @@ -277,8 +277,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) void TDMAppearanceWidget::makeReadOnly() { - disconnect( logobutton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLogoButtonClicked()) ); + disconnect( logobutton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLogoButtonClicked()) ); logobutton->setAcceptDrops(false); greetstr_lined->setReadOnly(true); noneRadio->setEnabled(false); @@ -307,7 +307,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) int index = fpath.findRev('/'); TQString nid = fpath.mid(index + 1); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); @@ -321,7 +321,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig config(*it, true); + TDESimpleConfig config(*it, true); config.setGroup("Color Scheme"); TQString str; @@ -342,7 +342,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) findAllResources("data", "tdestyle/themes/*.themerc", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig config(*it, true); + TDESimpleConfig config(*it, true); if (!(config.hasGroup("KDE") && config.hasGroup("Misc"))) continue; @@ -370,7 +370,7 @@ bool TDMAppearanceWidget::setLogo(TQString logo) if (p.isNull()) return false; if (p.width() > 100 || p.height() > 100) - p = p.smoothScale(100, 100, TQ_ScaleMin); + p = p.smoothScale(100, 100, TQImage::ScaleMin); logobutton->setPixmap(p); uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h index 69c2b241b..d79ac0524 100644 --- a/kcontrol/tdm/tdm-appear.h +++ b/kcontrol/tdm/tdm-appear.h @@ -44,7 +44,7 @@ class KLineEdit; class TDMAppearanceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMAppearanceWidget(TQWidget *parent, const char *name=0); diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index 487e8adbb..1d73dc4c8 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -32,12 +32,12 @@ #include <tqheader.h> #include <kdialog.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include "tdm-conv.h" -extern KSimpleConfig *config; +extern TDESimpleConfig *config; TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -55,7 +55,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(alGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQWidget *hlpw1 = new TQWidget( alGroup ); userlb = new KComboBox( hlpw1 ); @@ -64,7 +64,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) hlpl1->setColStretch(2, 1); hlpl1->addWidget(u_label, 0, 0); hlpl1->addWidget(userlb, 0, 1); - connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged())); + connect(userlb, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be logged in automatically."); TQWhatsThis::add( u_label, wtstr ); TQWhatsThis::add( userlb, wtstr ); @@ -74,18 +74,18 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 ); hlpl1->addWidget(d_label, 1, 0); hlpl1->addWidget(delaysb, 1, 1); - connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(delaysb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); wtstr = i18n("The delay (in seconds) before the automatic login kicks in. " "This feature is also known as \"timed login\"."); TQWhatsThis::add( d_label, wtstr ); TQWhatsThis::add( delaysb, wtstr ); againcb = new TQCheckBox( i18n("P&ersistent"), alGroup ); - connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( againcb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " "when TDM starts up. If this is checked, automatic login will kick in " "after finishing a session as well.") ); autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); - connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( autoLockCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session " "will be locked immediately (provided it is a TDE session). This can " "be used to obtain a super-fast login restricted to one user.") ); @@ -94,8 +94,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); puGroup->setSizePolicy( vpref ); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPresChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotChanged())); npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup); ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup); TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. " @@ -106,7 +106,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget(puGroup); puserlb = new KComboBox(true, hlpw); pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw); - connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(puserlb, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be preselected for login. " "This box is editable, so you can specify an arbitrary non-existent " "user to mislead possible attackers."); @@ -121,7 +121,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) "in the password field instead of the user field after preselecting a user. " "Use this to save one key press per login, if the preselection usually does not need to " "be changed.") ); - connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbjumppw, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this ); npGroup->setCheckable( true ); @@ -131,7 +131,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " password. This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(npGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup); npuserlv = new TDEListView(npGroup); @@ -141,8 +141,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) npuserlv->setResizeMode(TQListView::LastColumn); TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for." " Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.")); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); btGroup = new TQVGroupBox( i18n("Miscellaneous"), this ); @@ -152,12 +152,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " X server crash; note that this can open a security hole: if you use" " a screen locker than TDE's integrated one, this will make" " circumventing a password-secured screen lock possible.") ); - connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbarlen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); allowRootLogin = new TQCheckBox(i18n("Allow &Root Login"), btGroup); TQWhatsThis::add( allowRootLogin, i18n("When set this allows root logins directly in TDM. " "This is discouraged by some people. Use with caution.") ); - connect(allowRootLogin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(allowRootLogin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQGridLayout *main = new TQGridLayout(this, 5, 2, 10); main->addWidget(paranoia, 0, 0); @@ -169,12 +169,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) main->setColStretch(1, 2); main->setRowStretch(3, 1); - connect( userlb, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotSetAutoUser( const TQString & )) ); - connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotSetPreselUser( const TQString & )) ); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); + connect( userlb, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotSetAutoUser( const TQString & )) ); + connect( puserlb, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotSetPreselUser( const TQString & )) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); } diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h index 39e0e30f9..f6d9346b6 100644 --- a/kcontrol/tdm/tdm-conv.h +++ b/kcontrol/tdm/tdm-conv.h @@ -41,7 +41,7 @@ class TDMConvenienceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMConvenienceWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index 65dbea179..1e103d915 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -30,14 +30,14 @@ #include <tqwhatsthis.h> #include <kdialog.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdefontrequester.h> #include <tdelocale.h> #include "tdm-font.h" -extern KSimpleConfig *config; +extern TDESimpleConfig *config; TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -47,7 +47,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) stdFontChooser = new TDEFontRequester(this); label->setBuddy(stdFontChooser); TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); - connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(stdFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 1, 0); ml->addWidget(stdFontChooser, 1, 1); @@ -55,7 +55,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) failFontChooser = new TDEFontRequester(this); label->setBuddy(failFontChooser); TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); - connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(failFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 2, 0); ml->addWidget(failFontChooser, 2, 1); @@ -63,14 +63,14 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) greetingFontChooser = new TDEFontRequester(this); label->setBuddy(greetingFontChooser); TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); - connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(greetingFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 3, 0); ml->addWidget(greetingFontChooser, 3, 1); aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this); TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, " "fonts will be antialiased (smoothed) in the login dialog.") ); - connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged())); + connect(aacb, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(configChanged())); ml->addMultiCellWidget(aacb, 4, 4, 0, 1); ml->setRowStretch(5, 10); } diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h index fbbbc5028..2d4cb4e62 100644 --- a/kcontrol/tdm/tdm-font.h +++ b/kcontrol/tdm/tdm-font.h @@ -27,7 +27,7 @@ class TQCheckBox; class TDMFontWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMFontWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index 14e681d18..03fef8cae 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -17,6 +17,8 @@ Boston, MA 02110-1301, USA. */ +#include "config.h" + #include <unistd.h> #include <sys/types.h> @@ -27,7 +29,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <karrowbutton.h> #include <klineedit.h> #include <tdelocale.h> @@ -37,7 +39,7 @@ #include "tdm-shut.h" #include "kbackedcombobox.h" -extern KSimpleConfig *config; +extern TDESimpleConfig *config; TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) @@ -47,18 +49,18 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this ); - sdlcombo = new TQComboBox( FALSE, group0 ); + sdlcombo = new TQComboBox( false, group0 ); sdllabel = new TQLabel (sdlcombo, i18n ("&Local:"), group0); sdlcombo->insertItem(i18n("Everybody"), SdAll); sdlcombo->insertItem(i18n("Only Root"), SdRoot); sdlcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - sdrcombo = new TQComboBox( FALSE, group0 ); + connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + sdrcombo = new TQComboBox( false, group0 ); sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0); sdrcombo->insertItem(i18n("Everybody"), SdAll); sdrcombo->insertItem(i18n("Only Root"), SdRoot); sdrcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(sdrcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" " the computer using TDM. You can specify different values for local (console) and remote displays. " "Possible values are:<ul>" @@ -71,16 +73,16 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) shutdown_lined = new KURLRequester(group1); TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1); - connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(shutdown_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt"); TQWhatsThis::add( shutdown_label, wtstr ); TQWhatsThis::add( shutdown_lined, wtstr ); restart_lined = new KURLRequester(group1); TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1); - connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(restart_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot"); TQWhatsThis::add( restart_label, wtstr ); TQWhatsThis::add( restart_lined, wtstr ); @@ -91,17 +93,17 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) bm_combo = new KBackedComboBox( group4 ); bm_combo->insertItem("None", i18n("boot manager", "None")); bm_combo->insertItem("Grub", i18n("Grub")); -#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) ) +#if defined(Q_OS_LINUX) && ( defined(__i386__) || defined(__amd64__) ) bm_combo->insertItem("Lilo", i18n("Lilo")); #endif TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 ); - connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(bm_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog."); TQWhatsThis::add( bm_label, wtstr ); TQWhatsThis::add( bm_combo, wtstr ); tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this ); - connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( tsbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this option when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues or artifacts."); TQWhatsThis::add( tsbox, wtstr ); @@ -208,12 +210,8 @@ void TDMSessionsWidget::load() readSD(sdrcombo, "Root"); config->setGroup("Shutdown"); - restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot")); -#if defined(__OpenBSD__) - shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p")); -#else - shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff")); -#endif + restart_lined->setURL(config->readEntry("RebootCmd", REBOOT_BINARY)); + shutdown_lined->setURL(config->readEntry("HaltCmd", POWEROFF_BINARY)); bm_combo->setCurrentId(config->readEntry("BootManager", "None")); } @@ -222,8 +220,8 @@ void TDMSessionsWidget::load() void TDMSessionsWidget::defaults() { - restart_lined->setURL("/sbin/reboot"); - shutdown_lined->setURL("/sbin/poweroff"); + restart_lined->setURL(REBOOT_BINARY); + shutdown_lined->setURL(POWEROFF_BINARY); sdlcombo->setCurrentItem(SdAll); sdrcombo->setCurrentItem(SdRoot); diff --git a/kcontrol/tdm/tdm-shut.h b/kcontrol/tdm/tdm-shut.h index a8d22adc2..73e1f716f 100644 --- a/kcontrol/tdm/tdm-shut.h +++ b/kcontrol/tdm/tdm-shut.h @@ -30,7 +30,7 @@ class KBackedComboBox; class TDMSessionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMSessionsWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index fe2f31c65..35929102c 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -34,7 +34,7 @@ #include <kimagefilepreview.h> #include <tdeio/netaccess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kurldrag.h> @@ -43,12 +43,12 @@ #include <sys/stat.h> -extern KSimpleConfig *config; +extern TDESimpleConfig *config; TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { -#ifdef __linux__ +#ifdef Q_OS_LINUX struct stat st; if (!stat( "/etc/debian_version", &st )) { /* debian */ defminuid = "1000"; @@ -66,10 +66,18 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) defminuid = "500"; defmaxuid = "65000"; } -#else +#elif defined(Q_OS_SOLARIS) + struct stat st; + if (stat( "/etc/dilos_version_build", &st ) == 0) { /* DilOS */ + defminuid = "1000"; + } else { /* other illumos distro */ + defminuid = "100"; + } + defmaxuid = "60000"; +#else /* default */ defminuid = "1000"; defmaxuid = "65000"; -#endif +#endif /* default */ // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users, // and create them if necessary. @@ -85,30 +93,30 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQString wtstr; - minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this ); + minGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("System U&IDs"), this ); TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by TDM and this setup dialog." " Note that users with the UID 0 (typically root) are not affected by this and must be" " explicitly hidden in \"Not hidden\" mode.")); TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed ); - TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) ); + TQValidator *valid = new TQIntValidator( 0, 999999, minGroup ); TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); leminuid->setSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); - connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); - connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); lemaxuid->setSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); - connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); - connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); - usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotShowOpts()) ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup ); TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users," " so users can click on their name or image rather than typing in their login.") ); @@ -121,7 +129,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) "If not checked, select only the checked users. " "If checked, select all non-system users, except the checked ones.")); cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); - connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) ); + connect( cbusrsrt, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list." " Otherwise users are listed in the order they appear in the password file.") ); @@ -132,27 +140,27 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) optinlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optinlv ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptIn( TQListViewItem * )) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); optoutlv = new TDEListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); optoutlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optoutlv ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptOut( TQListViewItem * )) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); - faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this ); + faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this ); TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users." " \"Admin\" represents the global folder; these are the pictures you can set below." " \"User\" means that TDM should read the user's $HOME/.face.icon file." " The two selections in the middle define the order of preference if both sources are available.") ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotFaceOpts()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup ); rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup ); rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup ); @@ -162,29 +170,29 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget( picGroup ); usercombo = new KComboBox( hlpw ); TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") ); - connect( usercombo, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotUserSelected()) ); + connect( usercombo, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotUserSelected()) ); TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw ); userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); - connect( userbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUserButtonClicked()) ); + connect( userbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUserButtonClicked()) ); TQToolTip::add( userbutton, i18n("Click or drop an image here") ); TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" " of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); rstuserbutton = new TQPushButton( i18n("Unset"), hlpw ); TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") ); - connect( rstuserbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUnsetUserPix()) ); + connect( rstuserbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUnsetUserPix()) ); TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); hlpl->addWidget( userlabel, 0, 0 ); // hlpl->addSpacing( KDialog::spacingHint() ); hlpl->addWidget( usercombo, 0, 1 ); - hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter ); - hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter ); + hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, TQt::AlignHCenter ); + hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, TQt::AlignHCenter ); TQHBoxLayout *main = new TQHBoxLayout( this, 10 ); @@ -219,7 +227,7 @@ void TDMUsersWidget::makeReadOnly() rbprefusr->setEnabled(false); rbusronly->setEnabled(false); wstack->setEnabled(false); - disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) ); + disconnect( userbutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUserButtonClicked()) ); userbutton->setAcceptDrops(false); rstuserbutton->setEnabled(false); } @@ -264,7 +272,7 @@ void TDMUsersWidget::slotUserSelected() rstuserbutton->setEnabled( false ); } if (!p.isNull()) { - userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) ); + userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) ); } } @@ -288,7 +296,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix) return; } - p = p.smoothScale( 48, 48, TQ_ScaleMin ); + p = p.smoothScale( 48, 48, TQImage::ScaleMin ); TQString userpix = m_userPixDir + user + ".face.icon"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h index 08c66c6f8..157f29551 100644 --- a/kcontrol/tdm/tdm-users.h +++ b/kcontrol/tdm/tdm-users.h @@ -39,7 +39,7 @@ class TDMUsersWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index b58647a9e..de61a61b2 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -36,7 +36,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this); - gbox->setColumnLayout( 0, Qt::Horizontal ); + gbox->setColumnLayout( 0, TQt::Horizontal ); vbox->addWidget(gbox); TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); @@ -63,9 +63,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) // 1 sec seems to be a good compromise between latency and polling load. refreshTimer->start(1000); - connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh())); - connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refresh())); + connect(_devices, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"), diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h index eb33a475c..421129c30 100644 --- a/kcontrol/usbview/kcmusb.h +++ b/kcontrol/usbview/kcmusb.h @@ -23,7 +23,7 @@ class TQTextView; class USBViewer : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp index be5f3b63a..8e920952b 100644 --- a/kcontrol/usbview/usbdb.cpp +++ b/kcontrol/usbview/usbdb.cpp @@ -17,7 +17,7 @@ #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "usbdb.h" diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index d6f879fd4..5db7c84da 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -26,7 +26,7 @@ #include <kdialog.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "view1394.h" @@ -85,8 +85,8 @@ View1394::View1394(TQWidget *parent, const char *name) m_view->m_listview->setColumnAlignment(8, AlignRight); m_view->m_listview->setColumnAlignment(9, AlignRight); box->addWidget(m_view); - connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset())); - connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus())); + connect(m_view->m_busResetPb, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateBusReset())); + connect(&m_rescanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(rescanBus())); m_notifiers.setAutoDelete(true); rescanBus(); } @@ -188,7 +188,7 @@ void View1394::rescanBus() raw1394_set_userdata(handle, this); raw1394_set_bus_reset_handler(handle, my_reset_handler); TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read); - connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int))); + connect(notif, TQ_SIGNAL(activated(int)), this, TQ_SLOT(callRaw1394EventLoop(int))); m_notifiers.append(notif); m_handles.append(handle); @@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid) extern "C" { - KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index 6d015bce8..1a3da9735 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -45,7 +45,7 @@ class OuiDb class View1394: public TDECModule { - Q_OBJECT + TQ_OBJECT public: View1394(TQWidget *parent = 0L, const char *name = 0L); virtual ~View1394(); diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index d32adc1b8..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 */); @@ -223,7 +223,7 @@ TQWidget *KCMXinerama::indicator(int dpy) { si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->setAlignment(Qt::AlignCenter); + si->setAlignment(TQt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); @@ -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/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h index 83fdf6de9..940fdaa32 100644 --- a/kcontrol/xinerama/kcmxinerama.h +++ b/kcontrol/xinerama/kcmxinerama.h @@ -31,7 +31,7 @@ class TDEConfig; class TQWidget; class KCMXinerama : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMXinerama(TQWidget *parent = 0L, const char *name = 0L); virtual ~KCMXinerama(); 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> |
