Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

12 files changed, 15 insertions, 18 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index ded2ec88..7d73a3d7 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -424,7 +424,7 @@ void ShareDlgImpl::accessModifierBtnClicked()
   }
   
   
-  TQString name = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+  TQString name = sender()->name();
   
   TQLineEdit *edit = 0L;
       
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 46e4f02a..7f05207b 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -521,7 +521,7 @@ void TopLevel::buildHistMenu()
 // process a query via the history menu
 void TopLevel::queryHistMenu()
 {
-  TQCString name = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+  TQCString name = sender()->name();
   if (!name.isEmpty())
     define(TQString::fromUtf8(name));
 }
@@ -557,7 +557,7 @@ void TopLevel::stratDbChanged()
 
 void TopLevel::dbInfoMenuClicked()
 {
-  TQCString name = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+  TQCString name = sender()->name();
   if (!name.isEmpty())
     interface->showDbInfo(name);
 }
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index 53fad813..9678aa5a 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -1676,7 +1676,7 @@ void KopeteContactListView::slotAddContact()
 			Kopete::ContactList::self()->selectedMetaContacts().first();
 	Kopete::Group *group =
 			Kopete::ContactList::self()->selectedGroups().first();
-	Kopete::Account *account = dynamic_cast<Kopete::Account*>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent() );
+	Kopete::Account *account = dynamic_cast<Kopete::Account*>( sender()->parent() );
 
 	if ( ( metacontact && metacontact->isTemporary() ) ||
 			  (group && group->type()!=Kopete::Group::Normal ) )
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index a3983acb..f1e0e1fd 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -968,8 +968,7 @@ void KopeteWindow::setStatusMessage( const TQString & message )
 
 void KopeteWindow::slotBuildStatusMessageMenu()
 {
-	TQObject * senderObj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
-	m_globalStatusMessageMenu = static_cast<TDEPopupMenu *>( TQT_TQWIDGET(senderObj) );
+	m_globalStatusMessageMenu = static_cast<TDEPopupMenu *>( const_cast<TQObject*>(sender()) );
 	m_globalStatusMessageMenu->clear();
 // pop up a menu containing the away messages, and a lineedit
 // see kopeteaway
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 85a0d1fe..986cd84e 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -215,7 +215,7 @@ void PluginManager::slotPluginReadyForUnload()
 	// less clean for plugin authors
 	// FIXME: I don't buy the above argument. Add a Kopete::Plugin::emitReadyForUnload(void),
 	//        and make readyForUnload be passed a plugin. - Richard
-	Plugin *plugin = dynamic_cast<Plugin *>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) ) );
+	Plugin *plugin = dynamic_cast<Plugin *>( const_cast<TQObject*>( sender() ) );
 	kdDebug( 14010 ) << k_funcinfo << plugin->pluginId() << "ready for unload" << endl;
 	if ( !plugin )
 	{
diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
index 57dca0c0..44b10bbc 100644
--- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
@@ -37,7 +37,7 @@ MeanwhileAddContactPage::MeanwhileAddContactPage(
         static_cast<MeanwhileAccount *>(_account);
     if (account->infoPlugin->canProvideMeanwhileId())
     {
-        TQT_BASE_OBJECT_NAME::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()),
+        TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()),
                         TQT_SLOT(slotFindUser()));
     }
     else
diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
index 77955782..4e2c90ee 100644
--- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
+++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
@@ -106,7 +106,7 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget(
         slotSetServer2Default();
     }
 
-    TQT_BASE_OBJECT_NAME::connect(btnServerDefaults, TQT_SIGNAL(clicked()),
+    TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()),
             TQT_SLOT(slotSetServer2Default()));
 
     show();
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index a500028a..10fec375 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -1127,8 +1127,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange,
 void Client::haveServerForRedirect( const TQString& host, const TQByteArray& cookie, WORD )
 {
     //nasty sender() usage to get the task with chat room info
-	TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
-    ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( o );
+    ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( const_cast<TQObject*>(sender()) );
 
 	//create a new connection and set it up
 	int colonPos = host.find(':');
@@ -1248,8 +1247,7 @@ void Client::determineDisconnection( int code, const TQString& string )
         return;
 
     //yay for the sender() hack!
-	TQObject* obj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
-    Connection* c = dynamic_cast<Connection*>( obj );
+    Connection* c = dynamic_cast<Connection*>( const_cast<TQObject*>(sender()) );
     if ( !c )
         return;
 
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index ec8647b7..4597540f 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -367,7 +367,7 @@ bool KPPPWidget::eventFilter(TQObject *o, TQEvent *e) {
     return true;
   }
 
-    if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(connect_b)) {
+    if(o == connect_b) {
       if(e->type() == TQEvent::KeyPress) {
         if(connect_b->hasFocus() && ((TQKeyEvent *)e)->key() == TQt::Key_Return) {
           beginConnect();
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index f9a7280a..6053d7b8 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -735,7 +735,7 @@ bool KRDC::event(TQEvent *e) {
 
 bool KRDC::eventFilter(TQObject *watched, TQEvent *e) {
 	/* used to get events from TQScrollView  on resize  for scale mode*/
-	if (TQT_BASE_OBJECT(watched) != TQT_BASE_OBJECT(m_scrollView))
+	if (watched != m_scrollView)
 		return false;
 	if (e->type() != TQEvent::Resize)
 		return false;
diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp
index 1eb0df88..468b6dc1 100644
--- a/ksirc/ahistlineedit.cpp
+++ b/ksirc/ahistlineedit.cpp
@@ -362,7 +362,7 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e )
 #endif
 bool aHistLineEdit::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::AccelOverride )
+    if ( o == this && e->type() == TQEvent::AccelOverride )
         if(processKeyEvent( TQT_TQKEYEVENT( e ) ) == true)
             return true;
 
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index dfad0c5c..f04acd8e 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -207,7 +207,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed )
 {
     // This is called when a line appeared in this channel.
     // addressed is true if it was addressed to the user
-    TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) );
+    TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( const_cast<TQObject*>( sender() ) );
 
     if ( !window )
         return;
@@ -225,7 +225,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed )
 
 void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &channelName )
 {
-    TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) );
+    TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( const_cast<TQObject*>( sender() ) );
 
     if ( !window )
         return;