From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kabc/vcard/AdrParam.cpp | 2 +- kabc/vcard/ContentLine.cpp | 8 ++++---- kabc/vcard/DateValue.cpp | 4 ++-- kabc/vcard/GeoValue.cpp | 2 +- kabc/vcard/RToken.cpp | 2 +- kabc/vcard/SourceParam.cpp | 2 +- kabc/vcard/URIValue.cpp | 2 +- kabc/vcard/UTCValue.cpp | 2 +- kabc/vcard/VCard.cpp | 8 ++++---- kabc/vcard/VCardEntity.cpp | 4 ++-- kabc/vcard/include/VCardRToken.h | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kabc/vcard') diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp index 5ad56f4fb..899912553 100644 --- a/kabc/vcard/AdrParam.cpp +++ b/kabc/vcard/AdrParam.cpp @@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x) TQStrListIterator it(x.adrTypeList_); for (; it.current(); ++it) - if (!adrTypeList_.find(it.current())) + if (!adrTypeList_.tqfind(it.current())) return false; return true; diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 52bcdf4f5..31151be9f 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x) TQPtrListIterator it(x.paramList()); - if (!paramList_.find(it.current())) + if (!paramList_.tqfind(it.current())) return false; return true; @@ -142,7 +142,7 @@ ContentLine::_parse() // Unqote newlines strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" ); - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) { // invalid content line vDebug("No ':'"); @@ -152,7 +152,7 @@ ContentLine::_parse() TQCString firstPart(strRep_.left(split)); TQCString valuePart(strRep_.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -193,7 +193,7 @@ ContentLine::_parse() TQCString str = *it; - split = str.find("="); + split = str.tqfind("="); if (split < 0 ) { vDebug("No '=' in parameter."); continue; diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp index aedfe5eba..0311ac2e2 100644 --- a/kabc/vcard/DateValue.cpp +++ b/kabc/vcard/DateValue.cpp @@ -152,7 +152,7 @@ DateValue::_parse() // time = time-hour [":"] time-minute [":"] time-second [":"] // [time-secfrac] [time-zone] - int timeSep = strRep_.find('T'); + int timeSep = strRep_.tqfind('T'); TQCString dateStr; TQCString timeStr; @@ -192,7 +192,7 @@ DateValue::_parse() /////////////////////////////////////////////////////////////// ZONE - int zoneSep = timeStr.find('Z'); + int zoneSep = timeStr.tqfind('Z'); if (zoneSep != -1 && timeStr.length() - zoneSep > 3) { diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp index 2bac28c1e..3021bbdb1 100644 --- a/kabc/vcard/GeoValue.cpp +++ b/kabc/vcard/GeoValue.cpp @@ -84,7 +84,7 @@ GeoValue::clone() void GeoValue::_parse() { - int semiColon = strRep_.find( ";" ); + int semiColon = strRep_.tqfind( ";" ); if ( semiColon == -1 ) // invalid return; diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp index b0e251a87..582a9e1c7 100644 --- a/kabc/vcard/RToken.cpp +++ b/kabc/vcard/RToken.cpp @@ -30,7 +30,7 @@ namespace VCARD { - Q_UINT32 + TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l) { // FIXME no stderr ! diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp index d66d87498..7041acd9e 100644 --- a/kabc/vcard/SourceParam.cpp +++ b/kabc/vcard/SourceParam.cpp @@ -80,7 +80,7 @@ SourceParam::~SourceParam() void SourceParam::_parse() { - int i = strRep_.find('='); + int i = strRep_.tqfind('='); if (i == -1) // Invalid return; diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp index 98f75cb8e..ea598c5f5 100644 --- a/kabc/vcard/URIValue.cpp +++ b/kabc/vcard/URIValue.cpp @@ -89,7 +89,7 @@ URIValue::~URIValue() void URIValue::_parse() { - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) return; diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp index 30473661f..445af4fd7 100644 --- a/kabc/vcard/UTCValue.cpp +++ b/kabc/vcard/UTCValue.cpp @@ -93,7 +93,7 @@ UTCValue::_parse() positive_ = ( strRep_[0] == '+' ); - int colon = strRep_.find( ':' ); + int colon = strRep_.tqfind( ':' ); if ( colon == -1 ) // Not valid. return; diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index 50c25da59..c63e978d4 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -113,7 +113,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // FIRST LINE - int split = beginLine.find(':'); + int split = beginLine.tqfind(':'); if (split == -1) { // invalid, no BEGIN vDebug("No split"); @@ -123,7 +123,7 @@ VCard::_parse() TQCString firstPart(beginLine.left(split)); TQCString valuePart(beginLine.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -188,7 +188,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // LAST LINE - split = endLine.find(':'); + split = endLine.tqfind(':'); if (split == -1) // invalid, no END return; @@ -196,7 +196,7 @@ VCard::_parse() firstPart = endLine.left(split); valuePart = endLine.right(firstPart.length() - split - 1); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp index 1f8cea5b1..4c987bffe 100644 --- a/kabc/vcard/VCardEntity.cpp +++ b/kabc/vcard/VCardEntity.cpp @@ -76,11 +76,11 @@ VCardEntity::_parse() vDebug("parse"); TQCString s(strRep_); - int i = s.find(TQRegExp("BEGIN:VCARD", false)); + int i = s.tqfind(TQRegExp("BEGIN:VCARD", false)); while (i != -1) { - i = s.find(TQRegExp("BEGIN:VCARD", false), 11); + i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11); TQCString cardStr(s.left(i)); diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h index 0ea380267..5122ef55c 100644 --- a/kabc/vcard/include/VCardRToken.h +++ b/kabc/vcard/include/VCardRToken.h @@ -32,7 +32,7 @@ namespace VCARD { -KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); +KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); } -- cgit v1.2.1