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/address.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/address.cpp')
| -rw-r--r-- | kabc/address.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp index 9ecf8eb2d..2fce393e0 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName, ciso = countryToISO( country() ); } else { // fall back to our own country - ciso = KGlobal::locale()->country(); + ciso = TDEGlobal::locale()->country(); } KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) ); @@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName, // the rules of our own system country ) if ( !country().isEmpty() ) { KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) - + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); + + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); TQString cpos = entry.readEntry( "AddressCountryPosition" ); if ( "BELOW" == cpos || cpos.isEmpty() ) { @@ -520,7 +520,7 @@ TQString Address::countryToISO( const TQString &cname ) if ( it != mISOMap->end() ) return it.data(); - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); @@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname ) } // fall back to system country - mISOMap->insert( cname, KGlobal::locale()->country() ); - return KGlobal::locale()->country(); + mISOMap->insert( cname, TDEGlobal::locale()->country() ); + return TDEGlobal::locale()->country(); } TQString Address::ISOtoCountry( const TQString &ISOname ) @@ -550,7 +550,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) if ( ISOname.simplifyWhiteSpace().isEmpty() ) return TQString::null; - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); |