diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kabc/kab2kabc.cpp | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kabc/kab2kabc.cpp')
-rw-r--r-- | kabc/kab2kabc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index c23426260..2447229da 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) } else if ( fieldName == "ROLE" ) { a.setRole( fieldValue ); } else if ( fieldName == "BDAY" ) { - a.setBirthday( KGlobal::locale()->readDate( fieldValue ) ); + a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) ); } else if ( fieldName == "WEBPAGE" ) { a.setUrl( KURL( fieldValue ) ); } else if ( fieldName == "N" ) { @@ -280,7 +280,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) void importKab( KABC::AddressBook *ab, bool override, bool quiet ) { - TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" ); + TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" ); fileName += "addressbook.kab"; if ( !TQFile::exists( fileName ) ) { if ( !quiet ) { |