Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

18 files changed, 51 insertions, 51 deletions

diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 8ec676fb..41e7e0a9 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -689,9 +689,9 @@ void Converter::convertService( const Service &service )
       KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" );
       ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );";
 
-      ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),";
+      ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),";
       ctorCode.indent();
-      ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
+      ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
       ctorCode.unindent();
 
       dtorCode += "delete " + transport.name() + ";";
@@ -946,8 +946,8 @@ void Converter::createTransportClass()
   queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );";
   queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );";
   queryCode.newLine();
-  queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
-  queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );";
+  queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
+  queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );";
 
   query.setBody( queryCode );
 
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index b0fb78b0..9a31b31a 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -107,8 +107,8 @@ BinaryWidget::BinaryWidget( TQWidget *parent )
   mLayout->addWidget( mLoadButton, 0, 1 );
   mLayout->addWidget( mSaveButton, 1, 1 );
 
-  connect( mLoadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) );
-  connect( mSaveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( save() ) );
+  connect( mLoadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) );
+  connect( mSaveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( save() ) );
 }
 
 void BinaryWidget::setData( const TQByteArray &data )
diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp
index 88311266..12def657 100644
--- a/kode/kwsdl/kung/boolinputfield.cpp
+++ b/kode/kwsdl/kung/boolinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *BoolInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setChecked( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SLOT( inputChanged( bool ) ) );
+  connect( mInputWidget, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SLOT( inputChanged( bool ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index cb24670f..b7d6f8f0 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *DateInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setDate( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( dateChanged( TQDate ) ),
-           this, TQT_SLOT( inputChanged( TQDate ) ) );
+  connect( mInputWidget, TQ_SIGNAL( dateChanged( TQDate ) ),
+           this, TQ_SLOT( inputChanged( TQDate ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index 5c65d0c4..7b2ad477 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -57,10 +57,10 @@ void Dispatcher::setWSDL( const KWSDL::WSDL &wsdl )
   mConversationManager = new GeneralConversationManager( mWSDL );
 
   mTransport = new Transport( mWSDL.service().ports().first().mLocation );
-  connect( mTransport, TQT_SIGNAL( result( const TQString& ) ),
-           this, TQT_SLOT( result( const TQString& ) ) );
-  connect( mTransport, TQT_SIGNAL( error( const TQString& ) ),
-           this, TQT_SLOT( error( const TQString& ) ) );
+  connect( mTransport, TQ_SIGNAL( result( const TQString& ) ),
+           this, TQ_SLOT( result( const TQString& ) ) );
+  connect( mTransport, TQ_SIGNAL( error( const TQString& ) ),
+           this, TQ_SLOT( error( const TQString& ) ) );
 }
 
 void Dispatcher::run()
@@ -140,14 +140,14 @@ void Dispatcher::result( const TQString &xml )
 
   mLastMessage = mCurrentMessage;
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) );
 }
 
 void Dispatcher::error( const TQString &errorMsg )
 {
   KMessageBox::error( 0, errorMsg );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) );
 }
 
 #include "dispatcher.moc"
diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp
index 39f22774..1df00f03 100644
--- a/kode/kwsdl/kung/doubleinputfield.cpp
+++ b/kode/kwsdl/kung/doubleinputfield.cpp
@@ -78,8 +78,8 @@ TQWidget *DoubleInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setValue( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( valueChanged( double ) ),
-           this, TQT_SLOT( inputChanged( double ) ) );
+  connect( mInputWidget, TQ_SIGNAL( valueChanged( double ) ),
+           this, TQ_SLOT( inputChanged( double ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp
index 30c11670..f49ab4be 100644
--- a/kode/kwsdl/kung/enuminputfield.cpp
+++ b/kode/kwsdl/kung/enuminputfield.cpp
@@ -70,8 +70,8 @@ TQWidget *EnumInputField::createWidget( TQWidget *parent )
   mInputWidget->insertStringList( mEnums );
   mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) );
 
-  connect( mInputWidget, TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( inputChanged( int ) ) );
+  connect( mInputWidget, TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( inputChanged( int ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp
index 76d48cd5..38c08222 100644
--- a/kode/kwsdl/kung/integerinputfield.cpp
+++ b/kode/kwsdl/kung/integerinputfield.cpp
@@ -116,8 +116,8 @@ TQWidget *IntegerInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setValue( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( valueChanged( int ) ),
-           this, TQT_SLOT( inputChanged( int ) ) );
+  connect( mInputWidget, TQ_SIGNAL( valueChanged( int ) ),
+           this, TQ_SLOT( inputChanged( int ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 539e3de2..147c83fd 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -105,9 +105,9 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   layout->addWidget( mRemoveButton, 2, 1 );
 
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
 
   update();
 }
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 2dadbe9d..3036eeae 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -58,7 +58,7 @@ int main( int argc, char **argv )
   Loader loader;
   loader.setWSDLUrl( args->url( 0 ).path() );
 
-  TQTimer::singleShot( 0, &loader, TQT_SLOT( run() ) );
+  TQTimer::singleShot( 0, &loader, TQ_SLOT( run() ) );
 
   return app.exec();
 }
diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp
index 9ea45029..ee90eeec 100644
--- a/kode/kwsdl/kung/stringinputfield.cpp
+++ b/kode/kwsdl/kung/stringinputfield.cpp
@@ -84,8 +84,8 @@ TQWidget *StringInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setText( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( textChanged( const TQString& ) ),
-           this, TQT_SLOT( inputChanged( const TQString& ) ) );
+  connect( mInputWidget, TQ_SIGNAL( textChanged( const TQString& ) ),
+           this, TQ_SLOT( inputChanged( const TQString& ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp
index 38e1a264..024e2671 100644
--- a/kode/kwsdl/kung/timeinputfield.cpp
+++ b/kode/kwsdl/kung/timeinputfield.cpp
@@ -65,8 +65,8 @@ TQWidget *TimeInputField::createWidget( TQWidget *parent )
 
   mInputWidget->setTime( mValue );
 
-  connect( mInputWidget, TQT_SIGNAL( valueChanged( const TQTime& ) ),
-           this, TQT_SLOT( inputChanged( const TQTime& ) ) );
+  connect( mInputWidget, TQ_SIGNAL( valueChanged( const TQTime& ) ),
+           this, TQ_SLOT( inputChanged( const TQTime& ) ) );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp
index e9dabf3c..4961ad2f 100644
--- a/kode/kwsdl/kung/transport.cpp
+++ b/kode/kwsdl/kung/transport.cpp
@@ -45,8 +45,8 @@ void Transport::query( const TQString &xml )
   job->addMetaData( "UserAgent", "KDE Kung" );
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   
-  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
 }
 
 void Transport::slotData( TDEIO::Job*, const TQByteArray &data )
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index 5ba4f533..900f6ee4 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
   if ( args->isSet( "namespace" ) )
     compiler.setNameSpace( args->getOption( "namespace" ) );
 
-  TQTimer::singleShot( 0, &compiler, TQT_SLOT( run() ) );
+  TQTimer::singleShot( 0, &compiler, TQ_SLOT( run() ) );
 
   return app.exec();
 }
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index ed5606fd..8d435274 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -53,10 +53,10 @@ bool FileProvider::get( const TQString &url, TQString &target )
   tqDebug( "Downloading external schema '%s'", url.latin1() );
 
   TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false );
-  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
 
   mBlocked = true;
   while ( mBlocked ) {
diff --git a/kode/kwsdl/tests/google/googlesearch.cpp b/kode/kwsdl/tests/google/googlesearch.cpp
index fcea9d75..aa282a06 100644
--- a/kode/kwsdl/tests/google/googlesearch.cpp
+++ b/kode/kwsdl/tests/google/googlesearch.cpp
@@ -29,12 +29,12 @@
 GoogleSearch::GoogleSearch()
   : TQObject( 0, "" )
 {
-  connect( &mService, TQT_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ),
-           this, TQT_SLOT( cachedPageResult( TQByteArray* ) ) );
-  connect( &mService, TQT_SIGNAL( doSpellingSuggestionResponse( TQString* ) ),
-           this, TQT_SLOT( spellingSuggestionResult( TQString* ) ) );
-  connect( &mService, TQT_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ),
-           this, TQT_SLOT( googleSearchResult( GoogleSearchResult* ) ) );
+  connect( &mService, TQ_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ),
+           this, TQ_SLOT( cachedPageResult( TQByteArray* ) ) );
+  connect( &mService, TQ_SIGNAL( doSpellingSuggestionResponse( TQString* ) ),
+           this, TQ_SLOT( spellingSuggestionResult( TQString* ) ) );
+  connect( &mService, TQ_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ),
+           this, TQ_SLOT( googleSearchResult( GoogleSearchResult* ) ) );
 
   mKey = "";
 }
diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp
index d2e7c97e..095fe115 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.cpp
+++ b/kode/kwsdl/tests/google/googlesearchservice.cpp
@@ -183,14 +183,14 @@ void GoogleSearchService::doGoogleSearchResponseSlot( const TQString &xml )
 GoogleSearchService::GoogleSearchService()
 {
   mDoGetCachedPageTransport = new Transport( "http://api.google.com/search/beta2" );
-  connect( mDoGetCachedPageTransport, TQT_SIGNAL( result( const TQString& ) ),
-    this, TQT_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) );
+  connect( mDoGetCachedPageTransport, TQ_SIGNAL( result( const TQString& ) ),
+    this, TQ_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) );
   mDoSpellingSuggestionTransport = new Transport( "http://api.google.com/search/beta2" );
-  connect( mDoSpellingSuggestionTransport, TQT_SIGNAL( result( const TQString& ) ),
-    this, TQT_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) );
+  connect( mDoSpellingSuggestionTransport, TQ_SIGNAL( result( const TQString& ) ),
+    this, TQ_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) );
   mDoGoogleSearchTransport = new Transport( "http://api.google.com/search/beta2" );
-  connect( mDoGoogleSearchTransport, TQT_SIGNAL( result( const TQString& ) ),
-    this, TQT_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) );
+  connect( mDoGoogleSearchTransport, TQ_SIGNAL( result( const TQString& ) ),
+    this, TQ_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) );
 }
 
 GoogleSearchService::~GoogleSearchService()
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index 30b9645e..c7a390e8 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -48,8 +48,8 @@ void Transport::query( const TQString &xml )
   job->addMetaData( "UserAgent", "KWSDL" );
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   
-  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
 }
 
 void Transport::slotData( TDEIO::Job*, const TQByteArray &data )