diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:21 -0600 |
commit | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch) | |
tree | 89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /kresources/kolab/kabc | |
parent | 1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff) | |
download | tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kresources/kolab/kabc')
-rw-r--r-- | kresources/kolab/kabc/contact.cpp | 18 | ||||
-rw-r--r-- | kresources/kolab/kabc/contact.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index 7a26f62f7..796099025 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -293,12 +293,12 @@ TQDate Contact::anniversary() const return mAnniversary; } -void Contact::setChildren( const TQString& tqchildren ) +void Contact::setChildren( const TQString& children ) { - mChildren = tqchildren; + mChildren = children; } -TQString Contact::tqchildren() const +TQString Contact::children() const { return mChildren; } @@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const writeString( element, (*it).name, (*it).value ); } else { // skip writing the freebusyurl as it is a hack we need to remove eventually - if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) { + if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) { continue; } @@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element ) } break; case 'c': - if ( tagName == "tqchildren" ) { + if ( tagName == "children" ) { setChildren( element.text() ); return true; } @@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const writeString( element, "x-logo", mLogoAttachmentName ); if ( !sound().isNull() ) writeString( element, "x-sound", mSoundAttachmentName ); - writeString( element, "tqchildren", tqchildren() ); + writeString( element, "children", children() ); writeString( element, "gender", gender() ); writeString( element, "language", language() ); savePhoneAttributes( element ); @@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // (includes e.g. crypto settings, and extra im addresses) TQStringList knownCustoms; for ( const char** p = s_knownCustomFields; *p; ++p ) - knownCustoms << TQString::tqfromLatin1( *p ); + knownCustoms << TQString::fromLatin1( *p ); TQStringList customs = addressee->customs(); for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) { // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves @@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // mailer, timezone, productId, sortString, agent, rfc2426 name() // Things KAddressBook can't handle, so they are saved as unhandled tags: - // initials, tqchildren, gender, language + // initials, children, gender, language } // The loading is: xml -> Contact -> addressee, this is the second part @@ -1253,7 +1253,7 @@ void Contact::saveTo( KABC::Addressee* addressee ) } for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) { - TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app; + TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app; addressee->insertCustom( app, (*it).name, (*it).value ); } //kdDebug(5006) << addressee->customs() << endl; diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h index 60c399335..6e0de80bc 100644 --- a/kresources/kolab/kabc/contact.h +++ b/kresources/kolab/kabc/contact.h @@ -154,8 +154,8 @@ public: TQString soundAttachmentName() const { return mSoundAttachmentName; } TQByteArray sound() const { return mSound; } - void setChildren( const TQString& tqchildren ); - TQString tqchildren() const; + void setChildren( const TQString& children ); + TQString children() const; void setGender( const TQString& gender ); TQString gender() const; |