From bab40890696ec68c337dc290880423a0602b83c7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 16 Jan 2011 02:40:35 +0000 Subject: Finished remaining porting to new TQt API git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kabc/scripts/addressee.src.cpp | 18 +++++----- kabc/scripts/entrylist | 80 +++++++++++++++++++++--------------------- kabc/scripts/field.src.cpp | 4 +-- kabc/scripts/makeaddressee | 10 +++--- 4 files changed, 56 insertions(+), 56 deletions(-) (limited to 'kabc/scripts') diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp index 11384e456..9be85b22b 100644 --- a/kabc/scripts/addressee.src.cpp +++ b/kabc/scripts/addressee.src.cpp @@ -212,11 +212,11 @@ void Addressee::setNameFromString( const TQString &s ) setName( str ); // clear all name parts - setPrefix( TQString::null ); - setGivenName( TQString::null ); - setAdditionalName( TQString::null ); - setFamilyName( TQString::null ); - setSuffix( TQString::null ); + setPrefix( TQString() ); + setGivenName( TQString() ); + setAdditionalName( TQString() ); + setFamilyName( TQString() ); + setSuffix( TQString() ); if ( str.isEmpty() ) return; @@ -391,7 +391,7 @@ TQString Addressee::fullEmail( const TQString &email ) const } else { e = email; } - if ( e.isEmpty() ) return TQString::null; + if ( e.isEmpty() ) return TQString(); TQString text; if ( realName().isEmpty() ) @@ -444,7 +444,7 @@ void Addressee::removeEmail( const TQString &email ) TQString Addressee::preferredEmail() const { - if ( mData->emails.count() == 0 ) return TQString::null; + if ( mData->emails.count() == 0 ) return TQString(); else return mData->emails.first(); } @@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c ) detach(); mData->empty = false; - if ( mData->categories.findIndex( c ) != -1 ) return; + if ( mData->categories.tqfindIndex( c ) != -1 ) return; mData->categories.append( c ); } @@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c ) bool Addressee::hasCategory( const TQString &c ) const { - return ( mData->categories.findIndex( c ) != -1 ); + return ( mData->categories.tqfindIndex( c ) != -1 ); } void Addressee::setCategories( const TQStringList &c ) diff --git a/kabc/scripts/entrylist b/kabc/scripts/entrylist index 40af0d0c2..87c342a06 100644 --- a/kabc/scripts/entrylist +++ b/kabc/scripts/entrylist @@ -13,64 +13,64 @@ # Field Category : Categories the field belongs to (see Field::FieldCategory). # Output function: Function used to convert type to string for debug output (optional) -ALE,name,,QString,name +ALE,name,,TQString,name -ALFE,formatted name,,QString,formattedName,Frequent +ALFE,formatted name,,TQString,formattedName,Frequent -ALFE,family name,,QString,familyName,Frequent -ALFE,given name,,QString,givenName,Frequent -ALFE,additional names,,QString,additionalName -ALFE,honorific prefixes,,QString,prefix -ALFE,honorific suffixes,,QString,suffix +ALFE,family name,,TQString,familyName,Frequent +ALFE,given name,,TQString,givenName,Frequent +ALFE,additional names,,TQString,additionalName +ALFE,honorific prefixes,,TQString,prefix +ALFE,honorific suffixes,,TQString,suffix -ALFE,nick name,,QString,nickName,Personal +ALFE,nick name,,TQString,nickName,Personal -ALFE,birthday,,QDateTime,birthday,Personal,.toString() +ALFE,birthday,,TQDateTime,birthday,Personal,.toString() #Address address -LF,home address street,,QString,homeAddressStreet,Address|Personal -LF,home address city,,QString,homeAddressLocality,Address|Personal -LF,home address state,,QString,homeAddressRegion,Address|Personal -LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal -LF,home address country,,QString,homeAddressCountry,Address|Personal -LF,home address label,,QString,homeAddressLabel,Address|Personal - -LF,business address street,,QString,businessAddressStreet,Address|Organization -LF,business address city,,QString,businessAddressLocality,Address|Organization -LF,business address state,,QString,businessAddressRegion,Address|Organization -LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization -LF,business address country,,QString,businessAddressCountry,Address|Organization -LF,business address label,,QString,businessAddressLabel,Address|Organization +LF,home address street,,TQString,homeAddressStreet,Address|Personal +LF,home address city,,TQString,homeAddressLocality,Address|Personal +LF,home address state,,TQString,homeAddressRegion,Address|Personal +LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal +LF,home address country,,TQString,homeAddressCountry,Address|Personal +LF,home address label,,TQString,homeAddressLabel,Address|Personal + +LF,business address street,,TQString,businessAddressStreet,Address|Organization +LF,business address city,,TQString,businessAddressLocality,Address|Organization +LF,business address state,,TQString,businessAddressRegion,Address|Organization +LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization +LF,business address country,,TQString,businessAddressCountry,Address|Organization +LF,business address label,,TQString,businessAddressLabel,Address|Organization #phoneNumbers -LF,home phone,,QString,homePhone,Personal|Frequent -LF,business phone,,QString,businessPhone,Organization|Frequent -LF,mobile phone,,QString,mobilePhone,Frequent -LF,home fax,,QString,homeFax -LF,business fax,,QString,businessFax -LF,car phone,,QString,carPhone -LF,ISDN,,QString,isdn -LF,pager,,QString,pager +LF,home phone,,TQString,homePhone,Personal|Frequent +LF,business phone,,TQString,businessPhone,Organization|Frequent +LF,mobile phone,,TQString,mobilePhone,Frequent +LF,home fax,,TQString,homeFax +LF,business fax,,TQString,businessFax +LF,car phone,,TQString,carPhone +LF,ISDN,,TQString,isdn +LF,pager,,TQString,pager #emails -LF,email address,,QString,email,Email|Frequent +LF,email address,,TQString,email,Email|Frequent -ALFE,mail client,,QString,mailer,Email +ALFE,mail client,,TQString,mailer,Email ALE,time zone,,TimeZone,timeZone,,.asString() ALE,geographic position,,Geo,geo,,.asString() -ALFE,title,person,QString,title,Organization -ALFE,role,person in organization,QString,role,Organization -ALFE,organization,,QString,organization,Organization -ALFE,department,,QString,department,Organization +ALFE,title,person,TQString,title,Organization +ALFE,role,person in organization,TQString,role,Organization +ALFE,organization,,TQString,organization,Organization +ALFE,department,,TQString,department,Organization -ALFE,note,,QString,note +ALFE,note,,TQString,note -ALE,product identifier,,QString,productId -ALE,revision date,,QDateTime,revision,,.toString() +ALE,product identifier,,TQString,productId +ALE,revision date,,TQDateTime,revision,,.toString() -ALE,sort string,,QString,sortString +ALE,sort string,,TQString,sortString ALF,homepage,,KURL,url,,.url() diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index 8a270f2d4..5291303f5 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -344,7 +344,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value ) return true; } case FieldImpl::Birthday: - a.setBirthday( TQDate::fromString( value, Qt::ISODate ) ); + a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) ); return true; case FieldImpl::CustomField: a.insertCustom( mImpl->app(), mImpl->key(), value ); @@ -360,7 +360,7 @@ TQString Field::sortKey( const KABC::Addressee &a ) --CASEVALUE-- case FieldImpl::Birthday: if ( a.birthday().isValid() ) { - TQDate date = a.birthday().date(); + TQDate date = TQT_TQDATE_OBJECT(a.birthday().date()); TQString key; key.sprintf( "%02d-%02d", date.month(), date.day() ); return key; diff --git a/kabc/scripts/makeaddressee b/kabc/scripts/makeaddressee index cbc69543a..fa955b0bf 100755 --- a/kabc/scripts/makeaddressee +++ b/kabc/scripts/makeaddressee @@ -55,7 +55,7 @@ if (!open( H_OUT, ">../addressee.h" ) ) { print H_OUT " /**\n"; print H_OUT " Return translated label for $entryNames[$i] field.\n"; print H_OUT " */\n"; - print H_OUT " static QString $entryNames[$i]Label();\n\n"; + print H_OUT " static TQString $entryNames[$i]Label();\n\n"; } } else { print H_OUT; @@ -100,7 +100,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) { $labelwords[$j] = ucfirst $labelwords[$j]; } $label = join ' ', @labelwords; - print CPP_OUT "QString Addressee::$entryNames[$i]Label()\n{\n"; + print CPP_OUT "TQString Addressee::$entryNames[$i]Label()\n{\n"; if ( $entryComments[$i] ) { print CPP_OUT " return i18n(\"$entryComments[$i]\",\"$label\");\n"; } else { @@ -112,7 +112,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) { for( $i=0; $i<@entryNames; ++$i ) { if ( $entryCtrl[$i] =~ /E/ ) { if ( $entryNames[$i] !~ "revision" ) { - if ( $entryTypes[$i] =~ "QString" ) { + if ( $entryTypes[$i] =~ "TQString" ) { print CPP_OUT " if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n"; print CPP_OUT " !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n"; print CPP_OUT " kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n"; @@ -184,7 +184,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) { for( $i=0; $i<@entryNames; ++$i ) { if ( $entryCtrl[$i] !~ /A/ ) { next; } if ( $entryCtrl[$i] !~ /F/ ) { next; } - if ( $entryTypes[$i] ne "QString" ) { next; } + if ( $entryTypes[$i] ne "TQString" ) { next; } print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n"; print CPP_OUT " return a.$entryNames[$i]();\n"; } @@ -192,7 +192,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) { for( $i=0; $i<@entryNames; ++$i ) { if ( $entryCtrl[$i] !~ /A/ ) { next; } if ( $entryCtrl[$i] !~ /F/ ) { next; } - if ( $entryTypes[$i] ne "QString" ) { next; } + if ( $entryTypes[$i] ne "TQString" ) { next; } print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n"; print CPP_OUT " a.set" . ucfirst($entryNames[$i]) . "( value );\n"; print CPP_OUT " return true;\n"; -- cgit v1.2.1