From 7cc4356bc2eceb5a66c2263bff44aa472d2ca290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 Oct 2018 18:21:41 +0100 Subject: Fix build with a clean TQt namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/modules/notifier/notifierwindow.cpp | 22 +++++++++++----------- src/modules/notifier/notifierwindowborder.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/modules/notifier') diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 06bfbd23..290daaef 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -171,8 +171,8 @@ KviNotifierWindow::KviNotifierWindow() TQDesktopWidget * w = TQApplication::desktop(); TQRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen()); - /*debug("r.x(),r.y(): %d,%d",r.x(),r.y()); - debug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ + /*tqDebug("r.x(),r.y(): %d,%d",r.x(),r.y()); + tqDebug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ m_wndRect.setRect( r.x() + r.width() - (iWidth + SPACING), r.y() + r.height() - (iHeight + SPACING), iWidth, iHeight ); @@ -451,7 +451,7 @@ void KviNotifierWindow::heartbeat() targetOpacity/=100; bIncreasing = targetOpacity>m_dOpacity; m_dOpacity += bIncreasing ? OPACITY_STEP : -(OPACITY_STEP); - //debug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity)); + //tqDebug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity)); if( (bIncreasing && (m_dOpacity >= targetOpacity) ) || (!bIncreasing && (m_dOpacity <= targetOpacity) ) ) @@ -519,13 +519,13 @@ void KviNotifierWindow::doHide(bool bDoAnimate) if((!bDoAnimate) || (x() != m_pWndBorder->x()) || (y() != m_pWndBorder->y())) { - //debug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); + //tqDebug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); // the user asked to not animate or // the window has been moved and the animation would suck anyway // just hide quickly hideNow(); } else { - //debug ("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); + //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())); m_dOpacity = 1.0 - OPACITY_STEP; @@ -779,7 +779,7 @@ void KviNotifierWindow::redrawText() void KviNotifierWindow::mouseMoveEvent(TQMouseEvent * e) { - //debug ("move on x,y: %d,%d", e->pos().x(), e->pos().y()); + //tqDebug ("move on x,y: %d,%d", e->pos().x(), e->pos().y()); if (!m_bLeftButtonIsPressed) { @@ -874,9 +874,9 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e) } if(m_pWndBorder->captionRect().contains(e->pos())) { - //debug ("Clicked on m_pWndBorder->rect()"); + //tqDebug ("Clicked on m_pWndBorder->rect()"); if(m_pWndBorder->closeRect().contains(e->pos())) { - //debug ("\tClicked on m_pWndBorder->closeRect()"); + //tqDebug ("\tClicked on m_pWndBorder->closeRect()"); m_bCloseDown = true; m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED); goto sartelo; @@ -890,12 +890,12 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e) } } - //debug ("x,y: %d,%d - width,height: %d,%d", m_pWndBorder->rect().x(),m_pWndBorder->rect().y(),m_pWndBorder->rect().width(),m_pWndBorder->rect().height()); + //tqDebug ("x,y: %d,%d - width,height: %d,%d", m_pWndBorder->rect().x(),m_pWndBorder->rect().y(),m_pWndBorder->rect().width(),m_pWndBorder->rect().height()); if (m_pWndBorder->rect().contains(e->pos())) { if(m_pWndTabs->currentTab()) { - //debug ("Clicked on m_pWndBody->textRect()"); + //tqDebug ("Clicked on m_pWndBody->textRect()"); if(m_pWndBody->rctWriteIcon().contains(e->pos())) { m_pWndBody->setWriteIcon(WDG_ICON_CLICKED); @@ -950,7 +950,7 @@ void KviNotifierWindow::mouseReleaseEvent(TQMouseEvent * e) if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) { - //debug ("hide now from release event"); + //tqDebug ("hide now from release event"); hideNow(); } else { update(); diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/notifierwindowborder.h index 9bbd68fd..5483996e 100644 --- a/src/modules/notifier/notifierwindowborder.h +++ b/src/modules/notifier/notifierwindowborder.h @@ -117,7 +117,7 @@ public: void setHeight(int h); void resize(int w, int h) { setWidth(w); setHeight(h); }; void resize(TQSize r) { setWidth(r.width()); setHeight(r.height()); }; - void setGeometry(TQRect r) { r.topLeft(); r.size(); /*debug("x,y: %d,%d", r.x(), r.y()); debug("w,h: %d,%d", r.width(), r.height());*/ }; + void setGeometry(TQRect r) { r.topLeft(); r.size(); /*tqDebug("x,y: %d,%d", r.x(), r.y()); tqDebug("w,h: %d,%d", r.width(), r.height());*/ }; void setGeometry(TQPoint p, TQSize s) { setPoint (p.x(), p.y()); setWidth (s.width()); setHeight (s.height()); }; void setPoint(int x, int y) { m_pnt.setX(x); m_pnt.setY(y); m_rct.setX(x); m_rct.setY(y); }; -- cgit v1.2.1