From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mimelib/dwstring.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mimelib/dwstring.cpp') diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp index 52e42bef..b8686e41 100644 --- a/mimelib/dwstring.cpp +++ b/mimelib/dwstring.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // @@ -755,13 +755,13 @@ void DwString::swap(DwString& aStr) } -size_t DwString::find(const DwString& aStr, size_t aPos) const +size_t DwString::tqfind(const DwString& aStr, size_t aPos) const { - return find(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); + return tqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); } -size_t DwString::find(const char* aBuf, size_t aPos, size_t aLen) const +size_t DwString::tqfind(const char* aBuf, size_t aPos, size_t aLen) const { assert(aBuf != 0); if (aBuf == 0) return (size_t)-1; @@ -781,16 +781,16 @@ size_t DwString::find(const char* aBuf, size_t aPos, size_t aLen) const } -size_t DwString::find(const char* aCstr, size_t aPos) const +size_t DwString::tqfind(const char* aCstr, size_t aPos) const { assert(aCstr != 0); if (aCstr == 0) return (size_t)-1; size_t len = strlen(aCstr); - return find(aCstr, aPos, len); + return tqfind(aCstr, aPos, len); } -size_t DwString::find(char aChar, size_t aPos) const +size_t DwString::tqfind(char aChar, size_t aPos) const { if (aPos >= mLength) return (size_t)-1; const char* buf = mRep->mBuffer + mStart; @@ -801,13 +801,13 @@ size_t DwString::find(char aChar, size_t aPos) const } -size_t DwString::rfind(const DwString& aStr, size_t aPos) const +size_t DwString::rtqfind(const DwString& aStr, size_t aPos) const { - return rfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); + return rtqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); } -size_t DwString::rfind(const char* aBuf, size_t aPos, size_t aLen) const +size_t DwString::rtqfind(const char* aBuf, size_t aPos, size_t aLen) const { assert(aBuf != 0); if (aBuf == 0) return (size_t)-1; @@ -827,15 +827,15 @@ size_t DwString::rfind(const char* aBuf, size_t aPos, size_t aLen) const } -size_t DwString::rfind(const char* aCstr, size_t aPos) const +size_t DwString::rtqfind(const char* aCstr, size_t aPos) const { assert(aCstr != 0); size_t len = (aCstr) ? strlen(aCstr) : 0; - return rfind(aCstr, aPos, len); + return rtqfind(aCstr, aPos, len); } -size_t DwString::rfind(char aChar, size_t aPos) const +size_t DwString::rtqfind(char aChar, size_t aPos) const { size_t pos = DW_MIN(aPos, mLength - 1); const char* buf = mRep->mBuffer + mStart; @@ -1291,7 +1291,7 @@ void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t a } } } - // Is the tqreplacement smaller than the tqreplaced? + // Is the replacement smaller than the replaced? else if (len2 < len1) { to = mRep->mBuffer + mStart + pos1; from = aBuf; @@ -1381,7 +1381,7 @@ void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) } } } - // Is the tqreplacement smaller than the tqreplaced? + // Is the replacement smaller than the replaced? else if (len2 < len1) { to = mRep->mBuffer + mStart + pos1; for (i=0; i < len2; ++i) *to++ = aChar; -- cgit v1.2.3