summaryrefslogtreecommitdiffstats
path: root/kabc/vcard
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kabc/vcard
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kabc/vcard')
-rw-r--r--kabc/vcard/AdrParam.cpp4
-rw-r--r--kabc/vcard/ContentLine.cpp12
-rw-r--r--kabc/vcard/DateValue.cpp10
-rw-r--r--kabc/vcard/GeoValue.cpp2
-rw-r--r--kabc/vcard/RToken.cpp2
-rw-r--r--kabc/vcard/SourceParam.cpp2
-rw-r--r--kabc/vcard/URIValue.cpp2
-rw-r--r--kabc/vcard/UTCValue.cpp2
-rw-r--r--kabc/vcard/VCard.cpp8
-rw-r--r--kabc/vcard/VCardEntity.cpp4
-rw-r--r--kabc/vcard/include/VCardRToken.h2
11 files changed, 25 insertions, 25 deletions
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index 9c06bc223..5ad56f4fb 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_.tqfind(it.current()))
+ if (!adrTypeList_.find(it.current()))
return false;
return true;
@@ -100,7 +100,7 @@ AdrParam::_parse()
return;
}
- if (!strRep_.tqcontains('='))
+ if (!strRep_.contains('='))
return;
RTokenise(strRep_, ",", adrTypeList_);
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index a301a0244..52bcdf4f5 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x)
TQPtrListIterator<Param> it(x.paramList());
- if (!paramList_.tqfind(it.current()))
+ if (!paramList_.find(it.current()))
return false;
return true;
@@ -140,9 +140,9 @@ ContentLine::_parse()
vDebug("parse");
// Unqote newlines
- strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
+ strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
- int split = strRep_.tqfind(':');
+ int split = strRep_.find(':');
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.tqfind('.');
+ split = firstPart.find('.');
if (split != -1) {
group_ = firstPart.left(split);
@@ -193,7 +193,7 @@ ContentLine::_parse()
TQCString str = *it;
- split = str.tqfind("=");
+ split = str.find("=");
if (split < 0 ) {
vDebug("No '=' in parameter.");
continue;
@@ -275,7 +275,7 @@ ContentLine::_assemble()
}
// Quote newlines
- line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
+ line = line.replace( TQRegExp( "\n" ), "\\n" );
// Fold lines longer than 72 chars
const int maxLen = 72;
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index bc46b9536..aedfe5eba 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_.tqfind('T');
+ int timeSep = strRep_.find('T');
TQCString dateStr;
TQCString timeStr;
@@ -173,7 +173,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE
- dateStr.tqreplace(TQRegExp("-"), "");
+ dateStr.replace(TQRegExp("-"), "");
kdDebug(5710) << "dateStr: " << dateStr << endl;
@@ -192,7 +192,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// ZONE
- int zoneSep = timeStr.tqfind('Z');
+ int zoneSep = timeStr.find('Z');
if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
@@ -208,7 +208,7 @@ DateValue::_parse()
//////////////////////////////////////////////////// SECOND FRACTION
- int secFracSep = timeStr.tqfindRev(',');
+ int secFracSep = timeStr.findRev(',');
if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@@ -217,7 +217,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// HMS
- timeStr.tqreplace(TQRegExp(":"), "");
+ timeStr.replace(TQRegExp(":"), "");
hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt();
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index 3021bbdb1..2bac28c1e 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -84,7 +84,7 @@ GeoValue::clone()
void
GeoValue::_parse()
{
- int semiColon = strRep_.tqfind( ";" );
+ int semiColon = strRep_.find( ";" );
if ( semiColon == -1 ) // invalid
return;
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 582a9e1c7..b0e251a87 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -30,7 +30,7 @@
namespace VCARD
{
- TQ_UINT32
+ Q_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 7041acd9e..d66d87498 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -80,7 +80,7 @@ SourceParam::~SourceParam()
void
SourceParam::_parse()
{
- int i = strRep_.tqfind('=');
+ int i = strRep_.find('=');
if (i == -1) // Invalid
return;
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index ea598c5f5..98f75cb8e 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -89,7 +89,7 @@ URIValue::~URIValue()
void
URIValue::_parse()
{
- int split = strRep_.tqfind(':');
+ int split = strRep_.find(':');
if (split == -1)
return;
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 445af4fd7..30473661f 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -93,7 +93,7 @@ UTCValue::_parse()
positive_ = ( strRep_[0] == '+' );
- int colon = strRep_.tqfind( ':' );
+ int colon = strRep_.find( ':' );
if ( colon == -1 ) // Not valid.
return;
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index c63e978d4..50c25da59 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -113,7 +113,7 @@ VCard::_parse()
///////////////////////////////////////////////////////////////
// FIRST LINE
- int split = beginLine.tqfind(':');
+ int split = beginLine.find(':');
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.tqfind('.');
+ split = firstPart.find('.');
if (split != -1) {
group_ = firstPart.left(split);
@@ -188,7 +188,7 @@ VCard::_parse()
///////////////////////////////////////////////////////////////
// LAST LINE
- split = endLine.tqfind(':');
+ split = endLine.find(':');
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.tqfind('.');
+ split = firstPart.find('.');
if (split != -1) {
group_ = firstPart.left(split);
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 4c987bffe..1f8cea5b1 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.tqfind(TQRegExp("BEGIN:VCARD", false));
+ int i = s.find(TQRegExp("BEGIN:VCARD", false));
while (i != -1) {
- i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11);
+ i = s.find(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 5122ef55c..0ea380267 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -32,7 +32,7 @@
namespace VCARD
{
-KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
+KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
}