9 files changed, 20 insertions, 21 deletions
diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am
index 9dd839c5..66da11c3 100644
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = googletest
 
-googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
+googletest_SOURCES = main.cpp googlesearch.cpp transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
 googletest_LDADD = -ltdecore -ltdeio
 googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/kode/kwsdl/tests/google/README b/kode/kwsdl/tests/google/README
index cfe83159..46ef2ff0 100644
--- a/kode/kwsdl/tests/google/README
+++ b/kode/kwsdl/tests/google/README
@@ -1,7 +1,7 @@
 This application shows how easy it is to use a web service with
 code, generated by kwsdl_compiler.
 
-Only the files main.cc, googlesearch.cc and googlesearch.hh are
+Only the files main.cpp, googlesearch.cpp and googlesearch.h are
 written manually, all other files were created by
 
   kwsdl_compiler -d kwsdl/tests/google/ GoogleSearch.wsdl
diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cpp
index 690b9a11..aa282a06 100644
--- a/kode/kwsdl/tests/google/googlesearch.cc
+++ b/kode/kwsdl/tests/google/googlesearch.cpp
@@ -22,19 +22,19 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include "googlesearch.hh"
+#include "googlesearch.h"
 #include "resultelement.h"
 #include "resultelementarray.h"
 
 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/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.h
index b6400616..9551fc5d 100644
--- a/kode/kwsdl/tests/google/googlesearch.hh
+++ b/kode/kwsdl/tests/google/googlesearch.h
@@ -30,7 +30,6 @@
 
 class GoogleSearch : public TQObject
 {
-  Q_OBJECT
   TQ_OBJECT
 
   public:
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/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h
index e61cd446..0d2d8e79 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.h
+++ b/kode/kwsdl/tests/google/googlesearchservice.h
@@ -32,7 +32,7 @@
 
 class GoogleSearchService : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cpp
index 38c64594..130a9cc6 100644
--- a/kode/kwsdl/tests/google/main.cc
+++ b/kode/kwsdl/tests/google/main.cpp
@@ -3,7 +3,7 @@
 #include <tdecmdlineargs.h>
 #include <kmdcodec.h>
 
-#include "googlesearch.hh"
+#include "googlesearch.h"
 
 int main( int argc, char **argv )
 {
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 )
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index a0873e26..cfb8a6c1 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -29,7 +29,7 @@
 
 class Transport : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: