diff options
Diffstat (limited to 'src/modules/notifier')
-rw-r--r-- | src/modules/notifier/notifierwindow.cpp | 34 | ||||
-rw-r--r-- | src/modules/notifier/notifierwindowtabs.cpp | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 634af964..3e2f7d15 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -128,7 +128,7 @@ KviNotifierWindow::KviNotifierWindow() m_pLineEdit->setGeometry(0,0,0,0); m_pLineEdit->hide(); m_pLineEdit->installEventFilter(this); - connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(returnPressed())); + connect(m_pLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(returnPressed())); szFamily = cfg.readEntry("InputFontFamily","Arial"); m_pLineEdit->setFont(TQFont(szFamily,cfg.readIntEntry("InputFontSize",9))); @@ -174,7 +174,7 @@ KviNotifierWindow::KviNotifierWindow() TQFontMetrics titleFontMetrics(*m_pTitleFont); m_pWndBorder->centerTitle(titleFontMetrics.height()); - connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); + connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages())); } KviNotifierWindow::~KviNotifierWindow() @@ -326,7 +326,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) if(bDoAnimate) { m_pShowHideTimer = new TQTimer(); - connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); m_dOpacity = OPACITY_STEP; m_eState = Showing; m_bCrashShowWorkAround=true; @@ -455,7 +455,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate) } else { //tqDebug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); m_pShowHideTimer = new TQTimer(); - connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); m_dOpacity = 1.0 - OPACITY_STEP; m_eState = Hiding; update(); @@ -493,7 +493,7 @@ void KviNotifierWindow::startBlinking() if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing)) { m_pBlinkTimer = new TQTimer(); - connect(m_pBlinkTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(blink())); + connect(m_pBlinkTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(blink())); m_iBlinkCount = 0; m_pBlinkTimer->start(m_iBlinkTimeout); } @@ -509,11 +509,11 @@ void KviNotifierWindow::startAutoHideTimer() int nSecs = m_tAutoHideAt - m_tStartedAt; if(nSecs < 5)nSecs = 5; m_pAutoHideTimer = new TQTimer(); - connect(m_pAutoHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(autoHide())); + connect(m_pAutoHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(autoHide())); m_pAutoHideTimer->start(nSecs * 1000); m_pProgressTimer= new TQTimer(); - connect(m_pProgressTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(progressUpdate())); + connect(m_pProgressTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(progressUpdate())); m_pProgressTimer->start(60); } @@ -927,7 +927,7 @@ void KviNotifierWindow::keyReleaseEvent(TQKeyEvent * e) void KviNotifierWindow::delayedRaise(KviWindow * pWnd) { m_pWindowToRaise = pWnd; - TQTimer::singleShot(0,this,TQT_SLOT(delayedRaiseSlot())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedRaiseSlot())); } void KviNotifierWindow::delayedRaiseSlot() @@ -1128,7 +1128,7 @@ void KviNotifierWindow::contextPopup(const TQPoint &pos) if(!m_pContextPopup) { m_pContextPopup = new TQPopupMenu(this); - connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup())); + connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillContextPopup())); m_pDisablePopup = new TQPopupMenu(this); } @@ -1139,17 +1139,17 @@ void KviNotifierWindow::fillContextPopup() { m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQT_SLOT(hideNow())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQ_SLOT(hideNow())); m_pContextPopup->insertSeparator(); m_pDisablePopup->clear(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQT_SLOT(disableFor1Minute())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQT_SLOT(disableFor5Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQT_SLOT(disableFor15Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQT_SLOT(disableFor30Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQT_SLOT(disableFor60Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQ_SLOT(disableFor1Minute())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQ_SLOT(disableFor5Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQ_SLOT(disableFor15Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQ_SLOT(disableFor30Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQ_SLOT(disableFor60Minutes())); m_pDisablePopup->insertSeparator(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQ_SLOT(disableUntilKVIrcRestarted())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQ_SLOT(disablePermanently())); m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup); } diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 9e024d5b..faf10ba6 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -64,8 +64,8 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, TQString label) if(pWnd) { - connect(pWnd,TQT_SIGNAL(windowNameChanged()),this,TQT_SLOT(labelChanged())); - connect(pWnd,TQT_SIGNAL(destroyed()),this,TQT_SLOT(closeMe())); + connect(pWnd,TQ_SIGNAL(windowNameChanged()),this,TQ_SLOT(labelChanged())); + connect(pWnd,TQ_SIGNAL(destroyed()),this,TQ_SLOT(closeMe())); } } |