From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- kaddressbook/xxport/opera_xxport.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kaddressbook/xxport/opera_xxport.cpp') 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 ); } -- cgit v1.2.1