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 ++++++------ 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'amor') 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(); -- cgit v1.2.1