diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kresources/groupwise/soap/contactconverter.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/groupwise/soap/contactconverter.cpp')
-rw-r--r-- | kresources/groupwise/soap/contactconverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index 97aff84f2..605d14d69 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/kresources/groupwise/soap/contactconverter.cpp @@ -70,7 +70,7 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr ) std::vector<ngwt__ContainerRef*>* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 ); ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 ); containerRef->deleted = 0; - containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8(); + containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8().data(); container->push_back( containerRef ); contact->container = *container; @@ -402,7 +402,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact ) // TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere) if ( protocol == "nov" ) protocol = "groupwise"; - addr.insertCustom( TQString::tqfromLatin1("messaging/%1").arg( protocol ), + addr.insertCustom( TQString::tqfromLatin1("messaging/%1").tqarg( protocol ), TQString::tqfromLatin1( "All" ), addresses.join( TQChar( 0xE000 ) ) ); } @@ -456,7 +456,7 @@ ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber return 0; ngwt__PhoneNumber* phoneNumber = soap_new_ngwt__PhoneNumber( soap(), -1 ); - phoneNumber->__item = number.number().utf8(); + phoneNumber->__item = number.number().utf8().data(); if ( number.type() & KABC::PhoneNumber::Fax ) { phoneNumber->type = Fax; |