From 56160bf4dfe503631ef6373367b281f081bab2b4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:13 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77. --- kabc/vcard/AdrValue.cpp | 14 +++++++------- kabc/vcard/ContentLine.cpp | 2 +- kabc/vcard/LangValue.cpp | 2 +- kabc/vcard/NValue.cpp | 10 +++++----- kabc/vcard/OrgValue.cpp | 2 +- kabc/vcard/TextListValue.cpp | 2 +- kabc/vcard/VCard.cpp | 2 +- kabc/vcard/testread.cpp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kabc/vcard') diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp index 535ba6980..dc6384417 100644 --- a/kabc/vcard/AdrValue.cpp +++ b/kabc/vcard/AdrValue.cpp @@ -112,13 +112,13 @@ AdrValue::_parse() switch (i) { - case 0: poBox_ = l.at(0); break; - case 1: extAddress_ = l.at(1); break; - case 2: street_ = l.at(2); break; - case 3: locality_ = l.at(3); break; - case 4: region_ = l.at(4); break; - case 5: postCode_ = l.at(5); break; - case 6: countryName_ = l.at(6); break; + case 0: poBox_ = l.tqat(0); break; + case 1: extAddress_ = l.tqat(1); break; + case 2: street_ = l.tqat(2); break; + case 3: locality_ = l.tqat(3); break; + case 4: region_ = l.tqat(4); break; + case 5: postCode_ = l.tqat(5); break; + case 6: countryName_ = l.tqat(6); break; default: break; } } diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 52bcdf4f5..034cb1d32 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -174,7 +174,7 @@ ContentLine::_parse() return; } - name_ = l.at(0); + name_ = l.tqat(0); // Now we have the name, so the rest of 'l' is the params. // Remove the name part. diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp index f7e5a759e..d41c61d96 100644 --- a/kabc/vcard/LangValue.cpp +++ b/kabc/vcard/LangValue.cpp @@ -79,7 +79,7 @@ LangValue::_parse() if (l.count() == 0) return; - primary_ = l.at(0); + primary_ = l.tqat(0); l.remove(0u); diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp index e63268134..7bcfa1397 100644 --- a/kabc/vcard/NValue.cpp +++ b/kabc/vcard/NValue.cpp @@ -106,11 +106,11 @@ NValue::_parse() for (unsigned int i = 0; i < l.count(); i++) { switch (i) { - case 0: family_ = l.at(0); break; - case 1: given_ = l.at(1); break; - case 2: middle_ = l.at(2); break; - case 3: prefix_ = l.at(3); break; - case 4: suffix_ = l.at(4); break; + case 0: family_ = l.tqat(0); break; + case 1: given_ = l.tqat(1); break; + case 2: middle_ = l.tqat(2); break; + case 3: prefix_ = l.tqat(3); break; + case 4: suffix_ = l.tqat(4); break; default: break; } } diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp index 94ca18243..d3fb93ac7 100644 --- a/kabc/vcard/OrgValue.cpp +++ b/kabc/vcard/OrgValue.cpp @@ -102,6 +102,6 @@ OrgValue::numValues() OrgValue::value(unsigned int i) { parse(); - return valueList_.at(i); + return valueList_.tqat(i); } diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp index 2bec2e181..ef2b5d07d 100644 --- a/kabc/vcard/TextListValue.cpp +++ b/kabc/vcard/TextListValue.cpp @@ -102,6 +102,6 @@ TextListValue::numValues() TextListValue::value(unsigned int i) { parse(); - return valueList_.at(i); + return valueList_.tqat(i); } diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index 50c25da59..a1a9d1ba1 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -95,7 +95,7 @@ VCard::_parse() } // Get the first line - TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace(); + TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace(); vDebug("Begin line == \"" + beginLine + "\""); diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp index d1341fb49..3a33c7d54 100644 --- a/kabc/vcard/testread.cpp +++ b/kabc/vcard/testread.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include -- cgit v1.2.1