3 files changed, 15 insertions, 14 deletions
diff --git a/kaddressbook-plugins/xxports/kworldclock/Makefile.am b/kaddressbook-plugins/xxports/kworldclock/Makefile.am
index ee28aa6..ab7ef9d 100644
--- a/kaddressbook-plugins/xxports/kworldclock/Makefile.am
+++ b/kaddressbook-plugins/xxports/kworldclock/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) 
+INCLUDES = $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = libkaddrbk_geo_xxport.la
 
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 72256b8..ba75565 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kconfig.h>
@@ -40,8 +40,8 @@ class FlagInfo
 
 K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_geo_xxport, GeoXXPort, "libkaddrbk_geo_xxport" )
 
-GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
-  : KAB::XXPort( ab, parent, name )
+GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+  : KAB::XXPort( ab, tqparent, name )
 {
   createExportAction( i18n( "Export Geo Data..." ) );
 }
@@ -58,9 +58,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
   if ( flags != 0 ) {
     for ( int i = 0; i < flags; ++i ) {
       FlagInfo info;
-      info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).arg( i ) );
-      info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) );
-      info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) );
+      info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).tqarg( i ) );
+      info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).tqarg( i ) );
+      info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).tqarg( i ) );
 
       availableFlags.append( info );
     }
@@ -102,9 +102,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
   int startVal = 0;
   TQValueList<FlagInfo>::Iterator it;
   for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) {
-    config.writeEntry( TQString( "Flag_%1_Color" ).arg( startVal ), (*it).color );
-    config.writeEntry( TQString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude );
-    config.writeEntry( TQString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude );
+    config.writeEntry( TQString( "Flag_%1_Color" ).tqarg( startVal ), (*it).color );
+    config.writeEntry( TQString( "Flag_%1_Latitude" ).tqarg( startVal ), (*it).latitude );
+    config.writeEntry( TQString( "Flag_%1_Longitude" ).tqarg( startVal ), (*it).longitude );
   }
   config.writeEntry( "Flags", startVal );
 
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h
index cdac56a..d31ce49 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef GEO_XXPORT_H
@@ -29,9 +29,10 @@
 class GeoXXPort : public KAB::XXPort
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
 
     TQString identifier() const { return "geo"; }