Drop TQT_TQ*_CONST defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 23278d259378e17087bf9aeaa5e45974dfb74bce)

18 files changed, 26 insertions, 26 deletions

diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp
index 2ca87ef86..3c64ffe66 100644
--- a/dnssd/servicebrowser.cpp
+++ b/dnssd/servicebrowser.cpp
@@ -108,7 +108,7 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const
 
 void ServiceBrowser::serviceResolved(bool success)
 {
-	TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()));
+	TQObject* sender_obj = const_cast<TQObject*>(sender());
 	RemoteService* svr = static_cast<RemoteService*>(sender_obj);
 	disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool)));
 	TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin();
diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp
index 287786e3d..b08888f57 100644
--- a/kate/part/katesupercursor.cpp
+++ b/kate/part/katesupercursor.cpp
@@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor)
 void KateSuperRangeList::slotEliminated()
 {
   if (sender()) {
-    KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())));
+    KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender()));
     emit rangeEliminated(range);
 
     if (m_trackingBoundaries) {
diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index 423bfad19..71246497f 100644
--- a/tdeabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
@@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
     card.addLine( createAgent( version, (*addrIt).agent() ) );
 
     // BDAY
-    card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) ) );
+    card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) );
 
     // CATEGORIES
     if ( version == VCard::v3_0 ) {
@@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
       card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) );
 
     // REV
-    card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) ) );
+    card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) );
 
     // ROLE
     VCardLine roleLine( "ROLE", TQString((*addrIt).role()) );
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 87a75cebd..f3e7a82ae 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -222,7 +222,7 @@ void KLibrary::slotObjectCreated( TQObject *obj )
 
 void KLibrary::slotObjectDestroyed()
 {
-  m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) );
+  m_objs.removeRef( sender() );
 
   if ( m_objs.count() == 0 )
   {
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 23e805577..64e87c5e5 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog()
 
 void PermissionDialog::clicked()
 {
-    m_button = TQT_TQOBJECT_CONST(sender())->name();
+    m_button = sender()->name();
     static_cast<const TQWidget*>(sender())->parentWidget()->close();
 }
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 03b38a75d..24a2636e4 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -263,7 +263,7 @@ void TDEHTMLPartBrowserExtension::copy()
 void TDEHTMLPartBrowserExtension::searchProvider()
 {
     // action name is of form "previewProvider[<searchproviderprefix>:]"
-    const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 );
+    const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 );
 
     KURIFilterData data;
     TQStringList list;
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 769c83a9f..31b2fd478 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -5033,7 +5033,7 @@ void TDEHTMLPart::slotParentCompleted()
 
 void TDEHTMLPart::slotChildStarted( TDEIO::Job *job )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( sender() );
 
   assert( child );
 
@@ -5060,7 +5060,7 @@ void TDEHTMLPart::slotChildCompleted()
 
 void TDEHTMLPart::slotChildCompleted( bool pendingAction )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( sender() );
 
   if ( child ) {
     kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@@ -5093,7 +5093,7 @@ void TDEHTMLPart::slotChildDocCreated()
 
 void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
+  tdehtml::ChildFrame *child = frame( sender()->parent() );
   TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 7b564f337..a6fe0ba4f 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -935,7 +935,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url )
 // delayed updating of files, FAM is flooding us with events
 void KDirListerCache::slotFileDirtyDelayed()
 {
-  TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() );
+  TQString file = TQString::fromUtf8( sender()->name() );
 
   kdDebug(7004) << k_funcinfo << file << endl;
 
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 4e5c2f62b..19c201800 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -135,7 +135,7 @@ void TabWidget::childDestroyed()
 {
   // if we lost a child we uninstall ourself as event filter for the lost
   // child and its children
-  const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
+  const TQObject* pLostChild = sender();
   if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
   {
      TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index b90ed170c..19a0edfb2 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -493,7 +493,7 @@ void KMdiChildView::slot_childDestroyed()
 
 	// if we lost a child we uninstall ourself as event filter for the lost
 	// child and its children
-	const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender());
+	const TQObject * pLostChild = sender();
 	if ( pLostChild && ( pLostChild->isWidgetType() ) )
 	{
 		TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index ce3f356d8..c4b35bc6f 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
 
 void KMMainView::slotChangePrinterState()
 {
-	TQString	opname = TQT_TQOBJECT_CONST(sender())->name();
+	TQString	opname = sender()->name();
 	if (m_current && opname.startsWith("printer_"))
 	{
 		opname = opname.mid(8);
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 59ae3982d..a3a395aaf 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len)
 
 void EscpWidget::slotButtonClicked()
 {
-	TQString	arg = TQT_TQOBJECT_CONST(sender())->name();
+	TQString	arg = sender()->name();
 	startCommand(arg);
 }
 
diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp
index 8e1f5605f..806815ef6 100644
--- a/tdestyles/kthemestyle/kthemebase.cpp
+++ b/tdestyles/kthemestyle/kthemebase.cpp
@@ -231,7 +231,7 @@ union kthemeKey{
     unsigned int cacheKey;
 };
 
-#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x)))
+#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))
 
 void KThemeBase::generateBorderPix( int i )
 {
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index c82ffb83d..626c62c3e 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton()
 
 void KSwitchLanguageDialog::removeButtonClicked()
 {
-    TQObject const *signalSender = TQT_TQOBJECT_CONST(sender());
+    TQObject const *signalSender = sender();
     
     if (signalSender == NULL)
     {
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 63f633d95..985782f33 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -1109,7 +1109,7 @@ void TDEAction::activate()
 
 void TDEAction::slotActivated()
 {
-  const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+  const TQObject *senderObj = sender();
   if ( senderObj )
   {
     if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
@@ -1167,7 +1167,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
 void TDEAction::slotDestroyed()
 {
   kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl;
-  const TQObject* const o = TQT_TQOBJECT_CONST(sender());
+  const TQObject* const o = sender();
 
 #ifndef KDE_NO_COMPAT  // KDE 4: remove
   if ( o == d->m_tdeaccel )
@@ -1193,7 +1193,7 @@ void TDEAction::slotDestroyed()
   int i;
   do
   {
-    i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) );
+    i = findContainer(  static_cast<const TQWidget*>(o)  );
     if ( i != -1 )
       removeContainer( i );
   } while ( i != -1 );
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index a1e9f28a3..7ef60189c 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -322,12 +322,12 @@ void TDERadioAction::slotActivated()
 {
   if ( isChecked() )
   {
-    const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+    const TQObject *senderObj = sender();
 
     if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
       return;
 
-    const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
+    const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true );
 
     return;
   }
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 98e8264b6..fe0f123a9 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -547,7 +547,7 @@ void TDEActionCollection::slotMenuItemHighlighted( int id )
   if ( d->m_currentHighlightAction )
     emit actionHighlighted( d->m_currentHighlightAction, false );
 
-  TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+  TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
 
   d->m_currentHighlightAction = findAction( container, id );
 
@@ -581,7 +581,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
   if ( !d->m_highlight )
     return;
 
-  TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+  TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
 
   TDEAction *action = findAction( container, id );
 
@@ -606,7 +606,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
 
 void TDEActionCollection::slotDestroyed()
 {
-    d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) );
+    d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(sender()) ) );
 }
 
 TDEAction *TDEActionCollection::findAction( TQWidget *container, int id )
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index f04a48e74..b0637c182 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -345,7 +345,7 @@ TQRect TDECompletionBox::calculateGeometry() const
     if ( d->m_parent && (combo = d->m_parent->parent() ) &&
         combo->inherits("TQComboBox") )
     {
-        const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
+        const TQComboBox* cb = static_cast<const TQComboBox*>(combo);
 
         //Expand to the combo width
         w = TQMAX( w, cb->width() );