diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kaddressbook/xxport/opera_xxport.cpp | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kaddressbook/xxport/opera_xxport.cpp')
-rw-r--r-- | kaddressbook/xxport/opera_xxport.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 800f11fa6..4c2949cc9 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,14 +48,14 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) return addrList; 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; } @@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const while ( !stream.atEnd() ) { line = stream.readLine(); line = line.stripWhiteSpace(); - if ( line == TQString::fromLatin1( "#CONTACT" ) ) { + if ( line == TQString::tqfromLatin1( "#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::fromLatin1( "name" ) ) + if ( key == TQString::tqfromLatin1( "name" ) ) addr.setNameFromString( value ); - else if ( key == TQString::fromLatin1( "mail" ) ) { + else if ( key == TQString::tqfromLatin1( "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::fromLatin1( "phone" ) ) + } else if ( key == TQString::tqfromLatin1( "phone" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); - else if ( key == TQString::fromLatin1( "fax" ) ) + else if ( key == TQString::tqfromLatin1( "fax" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); - else if ( key == TQString::fromLatin1( "postaladdress" ) ) { + else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) { KABC::Address address( KABC::Address::Home ); address.setLabel( value.replace( separator, "\n" ) ); addr.insertAddress( address ); - } else if ( key == TQString::fromLatin1( "description" ) ) + } else if ( key == TQString::tqfromLatin1( "description" ) ) addr.setNote( value.replace( separator, "\n" ) ); - else if ( key == TQString::fromLatin1( "url" ) ) + else if ( key == TQString::tqfromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); - else if ( key == TQString::fromLatin1( "pictureurl" ) ) { + else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) { KABC::Picture pic( value ); addr.setPhoto( pic ); } |