Drop TQT_BASE_OBJECT* defines

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

4 files changed, 9 insertions, 9 deletions

diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 0d218532..03a70b5b 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -226,13 +226,13 @@ void KoTemplatesPane::changeAlwaysUseTemplate(KoTemplatesPane* sender, const TQS
 
 bool KoTemplatesPane::eventFilter(TQObject* watched, TQEvent* e)
 {
-  if(TQT_BASE_OBJECT(watched) == m_previewLabel) {
+  if(watched == m_previewLabel) {
     if(e->type() == TQEvent::MouseButtonDblClick) {
       openTemplate();
     }
   }
 
-  if(TQT_BASE_OBJECT(watched) == m_documentList) {
+  if(watched == m_documentList) {
     if((e->type() == TQEvent::Resize) && isShown()) {
       emit splitterResized(this, m_splitter->sizes());
     }
@@ -444,13 +444,13 @@ void KoRecentDocumentsPane::changePalette()
 
 bool KoRecentDocumentsPane::eventFilter(TQObject* watched, TQEvent* e)
 {
-  if(TQT_BASE_OBJECT(watched) == m_previewLabel) {
+  if(watched == m_previewLabel) {
     if(e->type() == TQEvent::MouseButtonDblClick) {
       openFile();
     }
   }
 
-  if(TQT_BASE_OBJECT(watched) == m_documentList) {
+  if(watched == m_documentList) {
     if((e->type() == TQEvent::Resize) && isShown()) {
       emit splitterResized(this, m_splitter->sizes());
     }
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index b1262ce5..114996c3 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -362,7 +362,7 @@ void KoFrame::resizeEvent( TQResizeEvent* )
 
 bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )
 {
-  if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartActivateEvent::test( ev ) )
+  if ( obj == d->m_view && KParts::PartActivateEvent::test( ev ) )
   {
     kdDebug(30003) << "Activate event"<< endl;
     KParts::PartActivateEvent* e = (KParts::PartActivateEvent*)ev;
@@ -374,7 +374,7 @@ bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )
 	setState( Inactive );
     }
   }
-  else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartSelectEvent::test( ev ) )
+  else if ( obj == d->m_view && KParts::PartSelectEvent::test( ev ) )
   {
     kdDebug(30003) << "Selected event" << endl;
     KParts::PartSelectEvent* e = (KParts::PartSelectEvent*)ev;
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 2dd15e95..36d5fbdc 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -1315,7 +1315,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
 {
   //kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl;
   // The action (sender) and the toolbar have the same name
-  TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+  TDEToolBar * bar = toolBar( sender()->name() );
   if (bar)
   {
     if (toggle)
@@ -1327,7 +1327,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
         saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
   }
   else
-    kdWarning(30003) << "slotToolbarToggled : Toolbar " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << " not found!" << endl;
+    kdWarning(30003) << "slotToolbarToggled : Toolbar " << sender()->name() << " not found!" << endl;
 }
 
 bool KoMainWindow::toolbarIsVisible(const char *tbName)
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 0e216098..cfdfc46d 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -265,7 +265,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
         showIcon();
         return true;
     }
-    else if (e->type() == TQEvent::Resize && d->panel && TQT_BASE_OBJECT(o) == d->panel) {
+    else if (e->type() == TQEvent::Resize && d->panel && o == d->panel) {
         // TODO: This doesn't always work.
         showIcon();
     }