From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kabc/kab2kabc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kabc/kab2kabc.cpp') 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 ) { -- cgit v1.2.1