Rename old tq methods that no longer need a unique name

4 files changed, 23 insertions, 23 deletions

diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 88a2c087a..14a40c611 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -387,7 +387,7 @@ void CSVImportDialog::initGUI()
   mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
   mDelimiterBox->tqlayout()->setMargin( marginHint() );
   TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
-  delimiterLayout->tqsetAlignment( TQt::AlignTop );
+  delimiterLayout->setAlignment( TQt::AlignTop );
   tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
 
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index abd3234b7..f4d1e9dbd 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -173,9 +173,9 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
+	TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
-	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
+	return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
 		.tqarg(i18n("Mobile Phone information:"))
 		.tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
 		.tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
@@ -272,7 +272,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		TQDateTime datetime;
 		gn_timestamp ts = gn_lib_get_pb_date(state);
 		if (ts.year<1998)
-			datetime = TQDateTime::tqcurrentDateTime();
+			datetime = TQDateTime::currentDateTime();
 		else
 			datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day),
 							  TQTime(ts.hour, ts.minute, ts.second) );
@@ -481,7 +481,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		if (Addr->isEmpty()) continue;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::tqfromLatin1(","));
+		TQString sem_repl(TQString::fromLatin1(","));
       		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
 		a.append( Addr->extended()     .replace( sem, sem_repl ) );
 		a.append( Addr->street()       .replace( sem, sem_repl ) );
@@ -891,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 	memset(memstat, 0, sizeof(*memstat));
 	memstat->memory_type = memtype;
 	data.memory_status = memstat;
-	error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state);
+	error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state);
 	GNOKII_CHECK_ERROR(error);
 	if (error != GN_ERR_NONE) {
 		switch (memtype) {
@@ -943,9 +943,9 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype )
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
+	TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
-	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
+	return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
 		.tqarg(i18n("Mobile Phone information:"))
 		.tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
 		.tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
@@ -1044,7 +1044,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// evaluate timestamp (ignore timezone)
 		TQDateTime datetime;
 		if (entry.date.year<1998)
-			datetime = TQDateTime::tqcurrentDateTime();
+			datetime = TQDateTime::currentDateTime();
 		else
 			datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day),
 							  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
@@ -1263,7 +1263,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Postal;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::tqfromLatin1(","));
+		TQString sem_repl(TQString::fromLatin1(","));
       		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
 		a.append( Addr->extended()     .replace( sem, sem_repl ) );
 		a.append( Addr->street()       .replace( sem, sem_repl ) );
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 4c2949cc9..a115d8dfd 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -48,7 +48,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
 {
   KABC::AddresseeList addrList;
 
-  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) );
+  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) );
   if ( fileName.isEmpty() )
     return addrList;
 
@@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
   while ( !stream.atEnd() ) {
     line = stream.readLine();
     line = line.stripWhiteSpace();
-    if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) {
+    if ( line == TQString::fromLatin1( "#CONTACT" ) ) {
       parseContact = true;
       addr = KABC::Addressee();
       continue;
@@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
       int sep = line.find( '=' );
       key = line.left( sep ).lower();
       value = line.mid( sep + 1 );
-      if ( key == TQString::tqfromLatin1( "name" ) )
+      if ( key == TQString::fromLatin1( "name" ) )
         addr.setNameFromString( value );
-      else if ( key == TQString::tqfromLatin1( "mail" ) ) {
+      else if ( key == TQString::fromLatin1( "mail" ) ) {
         TQStringList emails = TQStringList::split( separator, value );
 
         TQStringList::Iterator it = emails.begin();
@@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
           addr.insertEmail( *it, preferred );
           preferred = false;
         }
-      } else if ( key == TQString::tqfromLatin1( "phone" ) )
+      } else if ( key == TQString::fromLatin1( "phone" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value ) );
-      else if ( key == TQString::tqfromLatin1( "fax" ) )
+      else if ( key == TQString::fromLatin1( "fax" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value,
                               KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
-      else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) {
+      else if ( key == TQString::fromLatin1( "postaladdress" ) ) {
         KABC::Address address( KABC::Address::Home );
         address.setLabel( value.replace( separator, "\n" ) );
         addr.insertAddress( address );
-      } else if ( key == TQString::tqfromLatin1( "description" ) )
+      } else if ( key == TQString::fromLatin1( "description" ) )
         addr.setNote( value.replace( separator, "\n" ) );
-      else if ( key == TQString::tqfromLatin1( "url" ) )
+      else if ( key == TQString::fromLatin1( "url" ) )
         addr.setUrl( KURL( value ) );
-      else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) {
+      else if ( key == TQString::fromLatin1( "pictureurl" ) ) {
         KABC::Picture pic( value );
         addr.setPhoto( pic );
       }
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index e752b9057..849b24407 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 
             TQString vCardText;
 
-            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1()
+            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1()
             // and hope that are fields are encoded correctly.
-            if ( TQString::tqfromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
+            if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
               vCardText = TQString::fromUtf8( rawData );
             } else {
-              vCardText = TQString::tqfromLatin1( rawData );
+              vCardText = TQString::fromLatin1( rawData );
             }
             addrList += parseVCard( vCardText );
           }