diff options
Diffstat (limited to 'kaddressbook/common')
| -rw-r--r-- | kaddressbook/common/kabprefs.h | 4 | ||||
| -rw-r--r-- | kaddressbook/common/locationmap.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 688cab99f..5c7c8c0c7 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURL( const TQString &locationMapURL ) { - if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) ) + if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) ) mLocationMapURL = locationMapURL; } @@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURLs( const TQStringList &locationMapURLs ) { - if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) ) + if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) ) mLocationMapURLs = locationMapURLs; } diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index efae019c3..5788e6fcd 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) } #if KDE_VERSION >= 319 - return urlTemplate.replace( "%s", addr.street() ). - replace( "%r", addr.region() ). - replace( "%l", addr.locality() ). - replace( "%z", addr.postalCode() ). - replace( "%c", addr.countryToISO( addr.country() ) ); + return urlTemplate.tqreplace( "%s", addr.street() ). + tqreplace( "%r", addr.region() ). + tqreplace( "%l", addr.locality() ). + tqreplace( "%z", addr.postalCode() ). + tqreplace( "%c", addr.countryToISO( addr.country() ) ); #else - return urlTemplate.replace( "%s", addr.street() ). - replace( "%r", addr.region() ). - replace( "%l", addr.locality() ). - replace( "%z", addr.postalCode() ). - replace( "%c", "" ); + return urlTemplate.tqreplace( "%s", addr.street() ). + tqreplace( "%r", addr.region() ). + tqreplace( "%l", addr.locality() ). + tqreplace( "%z", addr.postalCode() ). + tqreplace( "%c", "" ); #endif } |