From cb5e787fde24bc986f17de4c78b5840f8ed85856 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 14:04:47 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- amor/amor.cpp | 48 +++++++++++++++++++-------------------- amor/amordialog.cpp | 12 +++++----- fifteenapplet/fifteenapplet.cpp | 4 ++-- fifteenapplet/qttableview.cpp | 24 ++++++++++---------- kmoon/kmoonapplet.cpp | 4 ++-- kmoon/kmoondlg.cpp | 8 +++---- kodo/kodometer.cpp | 12 +++++----- kteatime/timeedit.cpp | 16 ++++++------- kteatime/toplevel.cpp | 36 ++++++++++++++--------------- ktux/sprite.cpp | 10 ++++---- kweather/dockwidget.cpp | 4 ++-- kweather/kcmweatherapplet.cpp | 12 +++++----- kweather/kcmweatherservice.cpp | 8 +++---- kweather/kcmweatherstations.cpp | 2 +- kweather/kweather.cpp | 16 ++++++------- kweather/sidebarwidget.cpp | 6 ++--- kweather/stationsconfigwidget.cpp | 4 ++-- kweather/weatherbar.cpp | 2 +- kweather/weatherbutton.cpp | 8 +++---- kweather/weatherlib.cpp | 4 ++-- kweather/weatherservice.cpp | 12 +++++----- kworldwatch/main.cpp | 4 ++-- kworldwatch/mapwidget.cpp | 30 ++++++++++++------------ kworldwatch/zoneclock.cpp | 16 ++++++------- 24 files changed, 151 insertions(+), 151 deletions(-) diff --git a/amor/amor.cpp b/amor/amor.cpp index 2580794..c6de8af 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -136,37 +136,37 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() mState = Normal; mWin = new KWinModule; - connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(slotWindowActivate(WId))); - connect(mWin, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(slotWindowRemove(WId))); - connect(mWin, TQT_SIGNAL(stackingOrderChanged()), - this, TQT_SLOT(slotStackingChanged())); - connect(mWin, TQT_SIGNAL(windowChanged(WId, const unsigned long *)), - this, TQT_SLOT(slotWindowChange(WId, const unsigned long *))); - connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotDesktopChange(int))); + connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(slotWindowActivate(WId))); + connect(mWin, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(slotWindowRemove(WId))); + connect(mWin, TQ_SIGNAL(stackingOrderChanged()), + this, TQ_SLOT(slotStackingChanged())); + connect(mWin, TQ_SIGNAL(windowChanged(WId, const unsigned long *)), + this, TQ_SLOT(slotWindowChange(WId, const unsigned long *))); + connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotDesktopChange(int))); mAmor = new AmorWidget(); - connect(mAmor, TQT_SIGNAL(mouseClicked(const TQPoint &)), - TQT_SLOT(slotMouseClicked(const TQPoint &))); - connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), - TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); + connect(mAmor, TQ_SIGNAL(mouseClicked(const TQPoint &)), + TQ_SLOT(slotMouseClicked(const TQPoint &))); + connect(mAmor, TQ_SIGNAL(dragged(const TQPoint &, bool)), + TQ_SLOT(slotWidgetDragged(const TQPoint &, bool))); mAmor->resize(mTheme.maximumSize()); mTimer = new TQTimer(this); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); mStackTimer = new TQTimer(this); - connect(mStackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(restack())); + connect(mStackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(restack())); mBubbleTimer = new TQTimer(this); - connect(mBubbleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBubbleTimeout())); + connect(mBubbleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBubbleTimeout())); time(&mActiveTime); mCursPos = TQCursor::pos(); mCursorTimer = new TQTimer(this); - connect(mCursorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCursorTimeout())); + connect(mCursorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCursorTimeout())); mCursorTimer->start( 500 ); if (mWin->activeWindow()) @@ -610,10 +610,10 @@ void Amor::slotMouseClicked(const TQPoint &pos) TDEPopupMenu* helpMnu = help->menu(); mMenu = new TDEPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed - mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQT_SLOT(quit())); + mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQ_SLOT(quit())); } mMenu->exec(pos); @@ -710,9 +710,9 @@ void Amor::slotConfigure() if (!mAmorDialog) { mAmorDialog = new AmorDialog(); - connect(mAmorDialog, TQT_SIGNAL(changed()), TQT_SLOT(slotConfigChanged())); - connect(mAmorDialog, TQT_SIGNAL(offsetChanged(int)), - TQT_SLOT(slotOffsetChanged(int))); + connect(mAmorDialog, TQ_SIGNAL(changed()), TQ_SLOT(slotConfigChanged())); + connect(mAmorDialog, TQ_SIGNAL(offsetChanged(int)), + TQ_SLOT(slotOffsetChanged(int))); } mAmorDialog->show(); @@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget() { // the only function of this widget is to catch & forward the // saveYourself() signal from the session manager - connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(wm_saveyourself())); + connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself())); } void AmorSessionWidget::wm_saveyourself() diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index 53d4d7a..9af3b47 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -57,7 +57,7 @@ AmorDialog::AmorDialog() TQLabel *label = new TQLabel(i18n("Theme:"), themeBox); mThemeListBox = new TQListBox(themeBox); - connect(mThemeListBox,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotHighlighted(int))); + connect(mThemeListBox,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotHighlighted(int))); mThemeListBox->setMinimumSize( fontMetrics().maxWidth()*20, fontMetrics().lineSpacing()*6 ); @@ -75,23 +75,23 @@ AmorDialog::AmorDialog() TQSlider *slider = new TQSlider(-40, 40, 5, mConfig.mOffset, TQt::Vertical, offsetBox); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotOffset(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotOffset(int))); // Always on top TQCheckBox *checkBox = new TQCheckBox(i18n("Always on top"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOnTop(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOnTop(bool))); checkBox->setChecked(mConfig.mOnTop); checkBox = new TQCheckBox(i18n("Show random tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTips(bool))); checkBox->setChecked(mConfig.mTips); // always keep this one after the connect, or the TQPtrList would not be grayed when it should checkBox = new TQCheckBox(i18n("Use a random character"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTheme(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTheme(bool))); checkBox->setChecked(mConfig.mRandomTheme); checkBox = new TQCheckBox(i18n("Allow application tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotApplicationTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotApplicationTips(bool))); checkBox->setChecked(mConfig.mAppTips); readThemes(); diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index dd350cb..d2ffd9d 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -93,8 +93,8 @@ PiecesTable::PiecesTable(TQWidget* parent, const char* name ) : QtTableView(parent, name), _activeRow(-1), _activeCol(-1), _randomized(false) { _menu = new TQPopupMenu(this); - _menu->insertItem(i18n("R&andomize Pieces"), this, TQT_SLOT(randomizeMap())); - _menu->insertItem(i18n("&Reset Pieces"), this, TQT_SLOT(resetMap())); + _menu->insertItem(i18n("R&andomize Pieces"), this, TQ_SLOT(randomizeMap())); + _menu->insertItem(i18n("&Reset Pieces"), this, TQ_SLOT(resetMap())); _menu->adjustSize(); // setup table view setFrameStyle(StyledPanel | Sunken); diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp index 136247e..bbd5f2f 100644 --- a/fifteenapplet/qttableview.cpp +++ b/fifteenapplet/qttableview.cpp @@ -1447,12 +1447,12 @@ TQScrollBar *QtTableView::verticalScrollBar() const TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( TQWidget::NoFocus ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(verSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(verSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(verSbSlidingDone())); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(verSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(verSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(verSbSlidingDone())); sb->hide(); that->vScrollBar = sb; return sb; @@ -1478,12 +1478,12 @@ TQScrollBar *QtTableView::horizontalScrollBar() const sb->setFocusPolicy( TQWidget::NoFocus ); TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(horSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(horSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(horSbSlidingDone())); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(horSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(horSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(horSbSlidingDone())); sb->hide(); that->hScrollBar = sb; return sb; diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index e4f5509..7ece643 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -62,9 +62,9 @@ MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions, popup = new TQPopupMenu(); popup->insertItem(SmallIcon("kmoon"), i18n("&About"), this, - TQT_SLOT(showAbout())); + TQ_SLOT(showAbout())); popup->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, - TQT_SLOT(settings())); + TQ_SLOT(settings())); // missuse timerEvent for initialising timerEvent(0); diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp index db4b9b3..eeafbcc 100644 --- a/kmoon/kmoondlg.cpp +++ b/kmoon/kmoondlg.cpp @@ -60,7 +60,7 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) slider->setEnabled(TQPixmap::defaultDepth() > 8); label->setEnabled(TQPixmap::defaultDepth() > 8); TQWhatsThis::add(slider, text); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(angleChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(angleChanged(int))); TQHBox *hbox2 = new TQHBox(vbox); hbox2->setSpacing(spacingHint()); @@ -69,13 +69,13 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) hemitoggle->setText(north ? i18n("Switch to Southern Hemisphere") : i18n("Switch to Northern Hemisphere")); - connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi())); + connect(hemitoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleHemi())); masktoggle = new TQPushButton(hbox2); masktoggle->setText(mask ? i18n("Switch Masking Off") : i18n("Switch Masking On")); - connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask())); + connect(masktoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleMask())); topLayout->addWidget(vbox); moon = new MoonWidget(page, "preview"); @@ -84,7 +84,7 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) TQWhatsThis::add(moon, i18n("The moon as KMoon would display it\n" "following your current setting and time.")); topLayout->addWidget(moon); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(help())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(help())); // disableResize(); } diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp index 032d332..473b27e 100644 --- a/kodo/kodometer.cpp +++ b/kodo/kodometer.cpp @@ -88,18 +88,18 @@ Kodometer::Kodometer(TQWidget* parent, const char* name) menu->insertTitle(kapp->miniIcon(), TDEGlobal::instance()->aboutData()->programName()); - enabledID = menu->insertItem(i18n("&Enable"), this, TQT_SLOT(toggleEnabled())); + enabledID = menu->insertItem(i18n("&Enable"), this, TQ_SLOT(toggleEnabled())); metricID = menu->insertItem(i18n("&Metric Display"), this, - TQT_SLOT(toggleUnits())); + TQ_SLOT(toggleUnits())); autoResetID = menu->insertItem(i18n("Auto &Reset Trip"), this, - TQT_SLOT(toggleAutoReset())); - menu->insertItem(i18n("Reset &Trip"), this, TQT_SLOT(resetTrip())); - menu->insertItem(i18n("Reset &Odometer"), this, TQT_SLOT(resetTotal())); + TQ_SLOT(toggleAutoReset())); + menu->insertItem(i18n("Reset &Trip"), this, TQ_SLOT(resetTrip())); + menu->insertItem(i18n("Reset &Odometer"), this, TQ_SLOT(resetTotal())); menu->insertSeparator(); menu->insertItem(SmallIconSet("help"), i18n("&Help"), helpMnu); - menu->insertItem(SmallIconSet("system-log-out"), i18n("&Quit"), this, TQT_SLOT(quit())); + menu->insertItem(SmallIconSet("system-log-out"), i18n("&Quit"), this, TQ_SLOT(quit())); menu->setCheckable(true); menu->setItemChecked(enabledID, Enabled); diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp index 221029d..032b12e 100644 --- a/kteatime/timeedit.cpp +++ b/kteatime/timeedit.cpp @@ -71,10 +71,10 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) layout->addWidget(secondBox); layout->addWidget(sec); - connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) ); - connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) ); - connect(secondBox, TQT_SIGNAL(wrapUp()), TQT_SLOT(wrappedUp())); - connect(secondBox, TQT_SIGNAL(wrapDown()), TQT_SLOT(wrappedDown())); + connect(minuteBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) ); + connect(secondBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) ); + connect(secondBox, TQ_SIGNAL(wrapUp()), TQ_SLOT(wrappedUp())); + connect(secondBox, TQ_SIGNAL(wrapDown()), TQ_SLOT(wrappedDown())); } TimeEdit::~TimeEdit() @@ -107,7 +107,7 @@ int TimeEdit::value() return minuteBox->value()*60 + secondBox->value(); } -/** SLOT: Handle wrap-up of seconds-box */ +/** Slot: Handle wrap-up of seconds-box */ void TimeEdit::wrappedUp() { if (minuteBox->value() != minuteBox->maxValue()) { @@ -117,7 +117,7 @@ void TimeEdit::wrappedUp() } } -/** SLOT: Handle wrap-down of seconds-box */ +/** Slot: Handle wrap-down of seconds-box */ void TimeEdit::wrappedDown() { // well, the "if" should always be true @@ -128,7 +128,7 @@ void TimeEdit::wrappedDown() } } -/** SLOT: Handle any change in minutes of seconds */ +/** Slot: Handle any change in minutes of seconds */ void TimeEdit::spinBoxValueChanged(int) { if (value() == 0) { @@ -139,7 +139,7 @@ void TimeEdit::spinBoxValueChanged(int) emit valueChanged(value()); } -/** TQT_SLOT (overloading TQSpinBox): set focus */ +/** Slot (overloading TQSpinBox): set focus */ void TimeEdit::setFocus() { minuteBox->setFocus(); diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index b7ecb46..f38437a 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -118,24 +118,24 @@ TopLevel::TopLevel() : KSystemTray() startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0, - this, TQT_SLOT(start()), actionCollection(), "start"); + this, TQ_SLOT(start()), actionCollection(), "start"); stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0, - this, TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQ_SLOT(stop()), actionCollection(), "stop"); confAct = new TDEAction(i18n("&Configure..."), "configure", 0, - this, TQT_SLOT(config()), actionCollection(), "configure"); + this, TQ_SLOT(config()), actionCollection(), "configure"); anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0, - this, TQT_SLOT(anonymous()), actionCollection(), "anonymous"); + this, TQ_SLOT(anonymous()), actionCollection(), "anonymous"); // TDEAction *quitAct = actionCollection()->action("file_quit"); // create app menu (displayed on right-click) menu = new TQPopupMenu(); menu->setCheckable(true); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaSelected(int))); // this menu will be displayed when no tea is steeping, and left mouse button is clicked start_menu = new TQPopupMenu(); start_menu->setCheckable(true); // menu isn't tickable, but this gives some add. spacing - connect(start_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaStartSelected(int))); + connect(start_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaStartSelected(int))); rebuildTeaMenus(); // populate tops of menus with tea-entries from config @@ -152,13 +152,13 @@ TopLevel::TopLevel() : KSystemTray() menu->insertSeparator(); confAct->plug(menu); menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQT_SLOT(quit())); + menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQ_SLOT(quit())); // quitAct->plug(menu); // FIXME: this doesn't seem to work with above definition of quitAct? // (need special 'quit'-method?) // this menu will be displayed when a tea is steeping, and left mouse button is clicked steeping_menu = new TQPopupMenu(); -// steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQT_SLOT(stop())); +// steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQ_SLOT(stop())); stopAct->plug(steeping_menu); // FIXME: can provide different text for this incarnation? // start_menu->insertSeparator(); @@ -691,7 +691,7 @@ void TopLevel::config() listbox->addColumn(i18n("Time")); listbox->header()->setClickEnabled(false, listbox->header()->count()-1); listbox->setSorting(-1); - connect(listbox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(listBoxItemSelected())); + connect(listbox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(listBoxItemSelected())); // now buttons for editing the tea-list TQWidget *listgroup_widget = new TQWidget(listgroup); @@ -701,28 +701,28 @@ void TopLevel::config() TQToolTip::add(btn_new, i18n("New")); btn_new->setPixmap(SmallIcon("document-new")); btn_new->setMinimumSize(btn_new->sizeHint() * 1.2); - connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked())); + connect(btn_new, TQ_SIGNAL(clicked()), TQ_SLOT(newButtonClicked())); hbox->addWidget(btn_new); btn_del = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_del, i18n("Delete")); btn_del->setIconSet(SmallIconSet("edit-delete")); btn_del->setMinimumSize(btn_new->sizeHint() * 1.2); - connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked())); + connect(btn_del, TQ_SIGNAL(clicked()), TQ_SLOT(delButtonClicked())); hbox->addWidget(btn_del); btn_up = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_up, i18n("Up")); btn_up->setIconSet(SmallIconSet("go-up")); btn_up->setMinimumSize(btn_up->sizeHint() * 1.2); - connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked())); + connect(btn_up, TQ_SIGNAL(clicked()), TQ_SLOT(upButtonClicked())); hbox->addWidget(btn_up); btn_down = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_down, i18n("Down")); btn_down->setIconSet(SmallIconSet("go-down")); btn_down->setMinimumSize(btn_down->sizeHint() * 1.2); - connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked())); + connect(btn_down, TQ_SIGNAL(clicked()), TQ_SLOT(downButtonClicked())); hbox->addWidget(btn_down); hbox->addStretch(10); @@ -742,13 +742,13 @@ void TopLevel::config() nameEdit->setAlignment(TQLineEdit::AlignLeft); TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft); l->setFixedSize(l->sizeHint()); - connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) ); + connect(nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(nameEditTextChanged(const TQString&)) ); timeEdit = new TimeEdit(propright); timeEdit->setFixedHeight(timeEdit->sizeHint().height()); l = new TQLabel(timeEdit, i18n("Tea time:"), propleft); l->setFixedSize(l->sizeHint()); - connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int))); + connect(timeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int))); /* bottom - timeout actions */ TQGroupBox *actiongroup = new TQGroupBox(4,TQt::Vertical, i18n("Action"), page); @@ -758,7 +758,7 @@ void TopLevel::config() TQBoxLayout *actionconf_hbox = new TQHBoxLayout(actionconf_widget); btn_conf = new TQPushButton(i18n("Configure Events..."), actionconf_widget); actionconf_hbox->addWidget(btn_conf); - connect(btn_conf, TQT_SIGNAL(clicked()), TQT_SLOT(confButtonClicked())); + connect(btn_conf, TQ_SIGNAL(clicked()), TQ_SLOT(confButtonClicked())); actionconf_hbox->addStretch(10); eventEnable = new TQCheckBox(i18n("Event"), actiongroup); @@ -773,7 +773,7 @@ void TopLevel::config() actionEdit = new TQLineEdit(actionbox); actionEdit->setFixedHeight(actionEdit->sizeHint().height()); TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea")); - connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool))); + connect(actionEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(actionEnableToggled(bool))); rightside->addStretch(); // single checkbox @@ -784,7 +784,7 @@ void TopLevel::config() // let listbox claim all remaining vertical space top_box->setStretchFactor(box, 10); - connect(confdlg, TQT_SIGNAL(helpClicked()), TQT_SLOT(help())); + connect(confdlg, TQ_SIGNAL(helpClicked()), TQ_SLOT(help())); } // now add all defined teas (and their times) to the listview diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp index 292a013..eda20a5 100644 --- a/ktux/sprite.cpp +++ b/ktux/sprite.cpp @@ -66,7 +66,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) TQSlider *sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, this ); tl11->addWidget(sb); - connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); + connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) ); preview = new TQWidget( this ); preview->setFixedSize( 220, 170 ); @@ -77,14 +77,14 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) KButtonBox *bbox = new KButtonBox(this); TQButton *button = bbox->addButton( i18n("About")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT(slotAbout() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT(slotAbout() ) ); bbox->addStretch(1); button = bbox->addButton( KStdGuiItem::ok()); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) ); button = bbox->addButton(KStdGuiItem::cancel()); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); bbox->layout(); tl->addWidget(bbox); @@ -144,7 +144,7 @@ KSpriteSaver::KSpriteSaver( WId id ) : KScreenSaver( id ) readSettings(); blank(); - connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); mTimer.start(120-mSpeed, true); } diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index 11d45ea..d8a5f85 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -37,7 +37,7 @@ dockwidget::dockwidget(const TQString &location, TQWidget *parent, m_font = TDEGlobalSettings::generalFont(); setBackgroundOrigin( AncestorOrigin ); initDock(); - connect(m_button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( buttonClicked() )); + connect(m_button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( buttonClicked() )); m_weatherService = new WeatherService_stub( "KWeatherService", "WeatherService" ); updateIcon(); @@ -195,7 +195,7 @@ void dockwidget::initDock() updateFont(); - TQTimer::singleShot( 0, this, TQT_SLOT( showWeather() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showWeather() ) ); } /** resize the view **/ diff --git a/kweather/kcmweatherapplet.cpp b/kweather/kcmweatherapplet.cpp index 87decad..20b4cb4 100644 --- a/kweather/kcmweatherapplet.cpp +++ b/kweather/kcmweatherapplet.cpp @@ -63,12 +63,12 @@ KCMWeatherApplet::KCMWeatherApplet( TQWidget *parent, const char *name ) fillStationList(); load(); - connect( mWidget->m_viewMode, TQT_SIGNAL( released( int ) ), - TQT_SLOT( changeViewMode( int ) ) ); - connect( mWidget->m_reportLocation, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( reportLocationChanged() ) ); - connect( mWidget->m_textColor, TQT_SIGNAL( changed(const TQColor &) ), - TQT_SLOT( textColorChanged(const TQColor &) ) ); + connect( mWidget->m_viewMode, TQ_SIGNAL( released( int ) ), + TQ_SLOT( changeViewMode( int ) ) ); + connect( mWidget->m_reportLocation, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( reportLocationChanged() ) ); + connect( mWidget->m_textColor, TQ_SIGNAL( changed(const TQColor &) ), + TQ_SLOT( textColorChanged(const TQColor &) ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmweatherapplet" ), diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp index af48790..f014ff7 100644 --- a/kweather/kcmweatherservice.cpp +++ b/kweather/kcmweatherservice.cpp @@ -63,10 +63,10 @@ KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name ) layout->addStretch(); load(); - connect( mWidget->m_enableLog, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( enableLogWidgets( bool ) ) ); - connect( mWidget->m_iconTheme, TQT_SIGNAL( released( int ) ), - TQT_SLOT( changed() ) ); + connect( mWidget->m_enableLog, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( enableLogWidgets( bool ) ) ); + connect( mWidget->m_iconTheme, TQ_SIGNAL( released( int ) ), + TQ_SLOT( changed() ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmweatherservice" ), diff --git a/kweather/kcmweatherstations.cpp b/kweather/kcmweatherstations.cpp index 3d60f5a..73e257d 100644 --- a/kweather/kcmweatherstations.cpp +++ b/kweather/kcmweatherstations.cpp @@ -45,7 +45,7 @@ KCMWeatherStations::KCMWeatherStations( TQWidget *parent, const char *name ) mWidget = new StationsConfigWidget( this ); // not needed, as a change immediately changes the service - //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + //connect(mWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); layout->addWidget( mWidget ); TDEAboutData *about = new TDEAboutData( "kcmweatherstations", diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 1a215f4..9b8969a 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -65,12 +65,12 @@ kweather::kweather(const TQString& configFile, Type t, int actions, initDCOP(); dockWidget = new dockwidget(reportLocation, this, "dockwidget"); - connect(dockWidget, TQT_SIGNAL(buttonClicked()), TQT_SLOT(doReport())); + connect(dockWidget, TQ_SIGNAL(buttonClicked()), TQ_SLOT(doReport())); dockWidget->setViewMode(mViewMode); setLabelColor(); timeOut = new TQTimer(this, "timeOut" ); - connect(timeOut, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(timeOut, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timeOut->start(10*60*1000); if(mFirstRun) @@ -89,13 +89,13 @@ void kweather::initContextMenu() mContextMenu = new TDEPopupMenu(this); mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0); mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"), - this, TQT_SLOT(doReport()), 0, -1, 1); + this, TQ_SLOT(doReport()), 0, -1, 1); mContextMenu->insertItem(SmallIcon("reload"), i18n("&Update Now"), - this, TQT_SLOT(slotUpdateNow()), 0, -1, 2); + this, TQ_SLOT(slotUpdateNow()), 0, -1, 2); mContextMenu->insertSeparator(); - mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQT_SLOT(about())); + mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQ_SLOT(about())); mContextMenu->insertItem(SmallIcon("configure"), - i18n("&Configure KWeather..."), this, TQT_SLOT(preferences())); + i18n("&Configure KWeather..."), this, TQ_SLOT(preferences())); setCustomMenu(mContextMenu); } @@ -159,7 +159,7 @@ void kweather::preferences() if ( settingsDialog == 0 ) { settingsDialog = new KCMultiDialog( this ); - connect( settingsDialog, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotPrefsAccepted() ) ); + connect( settingsDialog, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotPrefsAccepted() ) ); settingsDialog->addModule( "kcmweatherapplet.desktop" ); settingsDialog->addModule( "kcmweatherservice.desktop" ); @@ -191,7 +191,7 @@ void kweather::doReport() { mReport = new reportView(reportLocation); - connect( mReport, TQT_SIGNAL( finished() ), TQT_SLOT( slotReportFinished() ) ); + connect( mReport, TQ_SIGNAL( finished() ), TQ_SLOT( slotReportFinished() ) ); } mReport->show(); diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index 1afe45a..dc481ec 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -45,9 +45,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) toolbar->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TDEAction *refresh = new TDEAction( i18n("Refresh"), SmallIcon("view-refresh"), - 0, this, TQT_SLOT(slotRefresh()), this, "refresh" ); + 0, this, TQ_SLOT(slotRefresh()), this, "refresh" ); TDEAction *prefs = new TDEAction( i18n("Settings"), SmallIcon("configure"), - 0, this, TQT_SLOT(slotConfigure()), this, "preferences" ); + 0, this, TQ_SLOT(slotConfigure()), this, "preferences" ); refresh->plug(toolbar); prefs->plug(toolbar); @@ -90,7 +90,7 @@ void sidebarwidget::slotConfigure() if ( settingsDialog == 0 ) { settingsDialog = new KCMultiDialog(0); - connect( settingsDialog, TQT_SIGNAL( configCommitted() ), this, TQT_SLOT( slotRefresh() ) ); + connect( settingsDialog, TQ_SIGNAL( configCommitted() ), this, TQ_SLOT( slotRefresh() ) ); settingsDialog->addModule( "kcmweatherstations.desktop" ); settingsDialog->addModule( "kcmweatherservice.desktop" ); diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp index 66d7c22..5ba7aee 100644 --- a/kweather/stationsconfigwidget.cpp +++ b/kweather/stationsconfigwidget.cpp @@ -60,8 +60,8 @@ StationsConfigWidget::StationsConfigWidget( TQWidget *parent, const char *name ) : stationsConfig( parent, name ), mService(0) { mService = new WeatherService_stub( "KWeatherService", "WeatherService" ); - connect( mAllStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( addStation() ) ); - connect( mSelectedStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( removeStation() ) ); + connect( mAllStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( addStation() ) ); + connect( mSelectedStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( removeStation() ) ); initGUI(); loadLocations(); diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index f191358..3570c1b 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -63,7 +63,7 @@ KonqSidebarWeather::KonqSidebarWeather(TDEInstance* inst, TQObject* parent, kdDebug() << "attached dcop signals..." << endl; timeOut = new TQTimer(this, "timeOut" ); - connect(timeOut, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateWidgets())); + connect(timeOut, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateWidgets())); updateWidgets(); } diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index 9137e54..986eebf 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -34,10 +34,10 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name ) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index ca95a31..31e6c5a 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -221,8 +221,8 @@ void WeatherLib::getData(Data *d, bool force /* try even if host was down last t d->job = TDEIO::file_copy( url, local, -1, true, false, false); d->job->addMetaData("cache", "reload"); // Make sure to get fresh info - connect( d->job, TQT_SIGNAL( result( TDEIO::Job *)), - TQT_SLOT(slotCopyDone(TDEIO::Job *))); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job *)), + TQ_SLOT(slotCopyDone(TDEIO::Job *))); kdDebug( 12006 ) << "Copying " << url.prettyURL() << " to " << local.prettyURL() << endl; emit fileUpdating(d->wi.reportLocation); diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp index e61138b..3ec47c9 100644 --- a/kweather/weatherservice.cpp +++ b/kweather/weatherservice.cpp @@ -40,12 +40,12 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p stationDB = new StationDatabase(); m_weatherLib = new WeatherLib(stationDB, this, "WeatherLib"); - connect(m_weatherLib, TQT_SIGNAL(fileUpdating( const TQString&)), - TQT_SLOT(updating( const TQString&))); - connect(m_weatherLib, TQT_SIGNAL(fileUpdate( const TQString&)), - TQT_SLOT(updated( const TQString&))); - connect(m_weatherLib, TQT_SIGNAL(stationRemoved(const TQString&)), - TQT_SLOT(slotStationRemoved(const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(fileUpdating( const TQString&)), + TQ_SLOT(updating( const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(fileUpdate( const TQString&)), + TQ_SLOT(updated( const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(stationRemoved(const TQString&)), + TQ_SLOT(slotStationRemoved(const TQString&))); TDEConfig *conf = kapp->config(); diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index e113d3a..5f8df3b 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -66,8 +66,8 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name) _clocks = new ZoneClockPanel(w); vbox->addWidget(_clocks); - connect(_map, TQT_SIGNAL(addClockClicked(const TQString &)), _clocks, TQT_SLOT(addClock(const TQString &))); - connect(_map, TQT_SIGNAL(saveSettings()), this, TQT_SLOT(doSave())); + connect(_map, TQ_SIGNAL(addClockClicked(const TQString &)), _clocks, TQ_SLOT(addClock(const TQString &))); + connect(_map, TQ_SIGNAL(saveSettings()), this, TQ_SLOT(doSave())); if (restore) load(kapp->config()); diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index ba1bba5..452a0ba 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -88,19 +88,19 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na int id; _flagPopup = new TQPopupMenu(this); TQPixmap flag = TQPixmap(locate("data", "kworldclock/pics/flag-red.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 0); flag = TQPixmap(locate("data", "kworldclock/pics/flag-green.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 1); flag = TQPixmap(locate("data", "kworldclock/pics/flag-blue.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 2); - id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 3); _flagPopup->insertSeparator(); - _flagPopup->insertItem(i18n("&Remove Flag"), this, TQT_SLOT(removeFlag())); - _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQT_SLOT(removeAllFlags())); + _flagPopup->insertItem(i18n("&Remove Flag"), this, TQ_SLOT(removeFlag())); + _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQ_SLOT(removeAllFlags())); _themePopup = new TQPopupMenu(this); _themes = MapLoader::themes(); @@ -108,13 +108,13 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na TQPtrListIterator it(_themes); for ( ; it.current(); ++it) { - int id = _themePopup->insertItem(it.current()->name(), this, TQT_SLOT(themeSelected(int))); + int id = _themePopup->insertItem(it.current()->name(), this, TQ_SLOT(themeSelected(int))); _themePopup->setItemParameter(id, cnt++); it.current()->setID(id); } TQPopupMenu *_clocksPopup = new TQPopupMenu(this); - _clocksPopup->insertItem(i18n("&Add..."), this, TQT_SLOT(addClock())); + _clocksPopup->insertItem(i18n("&Add..."), this, TQ_SLOT(addClock())); _popup = new TQPopupMenu(this); _popup->insertItem(i18n("&Flags"), _flagPopup); @@ -124,21 +124,21 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na _popup->insertSeparator(); _popup->insertItem(i18n("&Map Theme"), _themePopup); - _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQT_SLOT(toggleIllumination())); - _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQT_SLOT(toggleCities())); - _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQT_SLOT(toggleFlags())); + _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQ_SLOT(toggleIllumination())); + _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQ_SLOT(toggleCities())); + _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQ_SLOT(toggleFlags())); if (!applet) { _popup->insertSeparator(); - _popup->insertItem(i18n("&Save Settings"), this, TQT_SLOT(slotSaveSettings())); + _popup->insertItem(i18n("&Save Settings"), this, TQ_SLOT(slotSaveSettings())); } _popup->insertSeparator(); - _popup->insertItem(i18n("&About"), this, TQT_SLOT(about())); + _popup->insertItem(i18n("&About"), this, TQ_SLOT(about())); TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); timer->start(1000); _cityIndicator = new TQLabel(0,0, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); @@ -154,7 +154,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na if (restore && !applet) load(kapp->config()); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCityIndicator())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator())); } diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index 7d0ad6b..e791b98 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -69,9 +69,9 @@ ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *paren hbox->addWidget(_timeLabel, 0, TQt::AlignRight); _popup = new TQPopupMenu(this); - _popup->insertItem(i18n("&Edit..."), this, TQT_SLOT(editClock())); - _popup->insertItem(i18n("&Add..."), this, TQT_SLOT(slotAddClock())); - _popup->insertItem(i18n("&Remove"), this, TQT_SLOT(slotRemoveClock())); + _popup->insertItem(i18n("&Edit..."), this, TQ_SLOT(editClock())); + _popup->insertItem(i18n("&Add..."), this, TQ_SLOT(slotAddClock())); + _popup->insertItem(i18n("&Remove"), this, TQ_SLOT(slotRemoveClock())); _nameLabel->installEventFilter(this); _timeLabel->installEventFilter(this); @@ -87,7 +87,7 @@ void ZoneClock::slotRemoveClock() // So instead we fire up an idle event triggering the delete // after the return. - TQTimer::singleShot(0, this, TQT_SLOT(removeTimeout())); + TQTimer::singleShot(0, this, TQ_SLOT(removeTimeout())); } @@ -172,7 +172,7 @@ ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name) TQTimer *t = new TQTimer(this); - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateTimer())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateTimer())); t->start(500); _clocks.setAutoDelete(true); @@ -202,9 +202,9 @@ void ZoneClockPanel::addClock(const TQString &zone, const TQString &name) realign(); - connect(zc, TQT_SIGNAL(addClock(const TQString &)), this, TQT_SLOT(addClock(const TQString &))); - connect(zc, TQT_SIGNAL(changed()), this, TQT_SLOT(realign())); - connect(zc, TQT_SIGNAL(removeMe(ZoneClock *)), this, TQT_SLOT(removeClock(ZoneClock *))); + connect(zc, TQ_SIGNAL(addClock(const TQString &)), this, TQ_SLOT(addClock(const TQString &))); + connect(zc, TQ_SIGNAL(changed()), this, TQ_SLOT(realign())); + connect(zc, TQ_SIGNAL(removeMe(ZoneClock *)), this, TQ_SLOT(removeClock(ZoneClock *))); } -- cgit v1.2.3