Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

2 files changed, 17 insertions, 17 deletions

diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index 7a80f89..c5909c4 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -80,7 +80,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
-    KMessageBox::error( parentWidget(), msg.arg( fileName ) );
+    KMessageBox::error( parentWidget(), msg.tqarg( fileName ) );
     return addrList;
   }
 
@@ -91,7 +91,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
   line  = gmxStream.readLine();
   line2 = gmxStream.readLine();
   if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) {
-	KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").arg(fileName) );
+	KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) );
 	return addrList;
   }
 
@@ -122,7 +122,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
     if (checkDateTime(strList[5],dt)) addr->setBirthday(dt);
     addr->setNote(strList[6]);
     if (checkDateTime(strList[7],dt)) addr->setRevision(dt);
-    // addr->setStatus(strList[8]); Status
+    // addr->settqStatus(strList[8]); tqStatus
     // addr->xxx(strList[9]); Address_link_id 
     // addr->setCategory(strList[10]); Categories
     addrMap[strList[0]] = addr;
@@ -137,7 +137,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
 	return addrList;
   }
   // Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,Mobile_type,Email,
-  // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,Status
+  // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,tqStatus
   line = gmxStream.readLine();
   line = gmxStream.readLine();
 
@@ -181,7 +181,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
 			"KADDRESSBOOK", "X-Department", strList[17]); // Department
         if (checkDateTime(strList[18],dt)) addr->setRevision(dt); // Change_date
 	// strList[19]=Preferred (see above)
-	// strList[20]=Status (should always be "1")
+	// strList[20]=tqStatus (should always be "1")
 	addr->insertAddress(adr);
     } else {
 	kdWarning() << "unresolved line: " << line << endl;
@@ -214,8 +214,8 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( url.url() )
-                          .arg( strerror( tmpFile.status() ) ) );
+      KMessageBox::error( parentWidget(), txt.tqarg( url.url() )
+                          .tqarg( strerror( tmpFile.status() ) ) );
       return false;
     }
 
@@ -229,7 +229,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
 
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( filename ) );
+      KMessageBox::error( parentWidget(), txt.tqarg( filename ) );
       return false;
     }
 
@@ -243,7 +243,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
 static const TQString dateString( const TQDateTime &dt )
 {
   if (!dt.isValid())
-	return TQString::fromLatin1("1000-01-01 00:00:00");
+	return TQString::tqfromLatin1("1000-01-01 00:00:00");
   TQString d(dt.toString(Qt::ISODate));
   d[10] = ' '; // remove the "T" in the middle of the string
   return d;
@@ -281,7 +281,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
 	<< dateString(addr->birthday()) << DELIM   // Birthday
 	<< addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments
 	<< dateString(addr->revision()) << DELIM   // Change_date
-	<< "1##0\n";			// Status, Address_link_id, Categories
+	<< "1##0\n";			// tqStatus, Address_link_id, Categories
   }
 
   t << "####\n";
@@ -333,7 +333,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
 	  << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString()) << DELIM // Department
 	  << dateString(addr->revision()) << DELIM	// Change_date
 	  << 5 << DELIM				// Preferred
-	  << 1 << endl;				// Status (should always be "1")
+	  << 1 << endl;				// tqStatus (should always be "1")
     }
 
     ++no;
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 3d07955..51a37ac 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -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 );