summaryrefslogtreecommitdiffstats
path: root/kaddressbook/common
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kaddressbook/common
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook/common')
-rw-r--r--kaddressbook/common/kabprefs.h4
-rw-r--r--kaddressbook/common/locationmap.cpp20
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
}