Drop TQT_TQ*_OBJECT defines

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 20 insertions, 20 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 86ee8b059..d7b8268aa 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -1542,14 +1542,14 @@ void ClockApplet::aboutToShowContextMenu()
 
     TDELocale *loc = TDEGlobal::locale();
     TQDateTime dt = TQDateTime::currentDateTime();
-    dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
+    dt = dt.addSecs(TZoffset);
 
     TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
     copyMenu->insertItem(loc->formatDateTime(dt), 201);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205);
+    copyMenu->insertItem(loc->formatDate(dt.date()), 202);
+    copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
+    copyMenu->insertItem(loc->formatTime(dt.time()), 204);
+    copyMenu->insertItem(loc->formatTime(dt.time(), true), 205);
     copyMenu->insertItem(dt.date().toString(), 206);
     copyMenu->insertItem(dt.time().toString(), 207);
     copyMenu->insertItem(dt.toString(), 208);
@@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id )
 
 TQTime ClockApplet::clockGetTime()
 {
-    return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset));
+    return TQTime::currentTime().addSecs(TZoffset);
 }
 
 TQDate ClockApplet::clockGetDate()
 {
-    return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date());
+    return TQDateTime::currentDateTime().addSecs(TZoffset).date();
 }
 
 void ClockApplet::showZone(int z)
@@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
          (m_clock->type() == Prefs::EnumType::Analog) )
     {
         // show full time (incl. hour) as tooltip for Fuzzy clock
-        tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+        tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
     }
     else
     {
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index ee5fa9c1f..d1bab6f3b 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -113,7 +113,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
         e->type() == TQEvent::MouseButtonDblClick )
     {
         TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup && m_openTimer != -1
                     && (me->button() & Qt::LeftButton) )
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 1806fedbb..1836102be 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
                     // a hack for applets that have out-of-process
                     // elements (e.g the systray) so that the handle
                     // doesn't flicker when moving over those elements
-                    if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos())))
+                    if (w->rect().contains(w->mapFromGlobal(TQCursor::pos())))
                     {
                         nowDrawIt = true;
                     }
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 5b1eb5c8c..222b768ad 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos()))
+    if (ev->state() == Qt::LeftButton && !rect().contains(ev->pos()))
     {
         // leaveEvent() doesn't work, while grabbing the mouse
         _autoScrollTimer.stop();
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index b7e069706..57b027a34 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *)
 {
     // see PanelServiceMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aaac124c2..93674f394 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -568,7 +568,7 @@ void PanelButton::drawButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
         style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
@@ -607,7 +607,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
         style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
@@ -997,7 +997,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     if (e->type() == TQEvent::MouseMove)
     {
         TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) &&
+        if (rect().contains(mapFromGlobal(me->globalPos())) &&
             ((me->state() & ControlButton) != 0 ||
              (me->state() & ShiftButton) != 0))
         {
@@ -1009,7 +1009,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
              e->type() == TQEvent::MouseButtonDblClick)
     {
         TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             m_pressedDuringPopup = true;
             return true;
@@ -1018,7 +1018,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     else if (e->type() == TQEvent::MouseButtonRelease)
     {
         TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup)
             {
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 534387394..3d9369fc6 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/)
 {
     // see PrefMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 19adfa868..df6854efc 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -114,7 +114,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
 	if (!(e->state() & Qt::LeftButton))
 		return;
 
-	if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown))
+	if (!rect().contains(_mouseDown))
 		return;
 
 	int dragLength = (e->pos() - _mouseDown).manhattanLength();
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index b0e00964c..97ba53745 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -1061,7 +1061,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
 
     // This is to avoid the flicker caused by redrawing the
     // button as unpressed just before it's activated.
-    if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
+    if (!rect().contains(e->pos()))
     {
         TQToolButton::mouseReleaseEvent(e);
         return;