From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mimelib/LICENSE | 4 +-- mimelib/Tutorial | 4 +-- mimelib/binhex.cpp | 4 +-- mimelib/doc/addrlist.html | 2 +- mimelib/doc/body.html | 4 +-- mimelib/doc/bodypart.html | 2 +- mimelib/doc/entity.html | 4 +-- mimelib/doc/field.html | 8 ++--- mimelib/doc/headers.html | 2 +- mimelib/doc/mailbox.html | 4 +-- mimelib/doc/mboxlist.html | 2 +- mimelib/doc/message.html | 4 +-- mimelib/doc/string.html | 56 +++++++++++++++--------------- mimelib/dwstring.cpp | 86 +++++++++++++++++++++++------------------------ mimelib/mimelib/body.h | 4 +-- mimelib/mimelib/entity.h | 4 +-- mimelib/mimelib/field.h | 6 ++-- mimelib/mimelib/headers.h | 4 +-- mimelib/mimelib/mailbox.h | 6 ++-- mimelib/mimelib/message.h | 2 +- mimelib/mimelib/string.h | 30 ++++++++--------- 21 files changed, 121 insertions(+), 121 deletions(-) (limited to 'mimelib') diff --git a/mimelib/LICENSE b/mimelib/LICENSE index aaf47afb..623b6258 100644 --- a/mimelib/LICENSE +++ b/mimelib/LICENSE @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/mimelib/Tutorial b/mimelib/Tutorial index 2833dd03..dfa98156 100644 --- a/mimelib/Tutorial +++ b/mimelib/Tutorial @@ -18,7 +18,7 @@ following objectives in mind: MIME++ classes directly model the elements of the BNF grammar specified in RFC-822, RFC-2045, and RFC-2046. For this reason, I recommend that you understand these RFCs and keep a copy of them handy as you learn MIME++. -If you know C++ well, and if you are familiar with the RFCs, you should tqfind +If you know C++ well, and if you are familiar with the RFCs, you should find MIME++ easy to learn and use. If you are new to C++ and object-oriented programming, you will find in MIME++ some very good object-oriented techinques, and hopefully you will learn a lot. @@ -94,7 +94,7 @@ broken-down representation. If you add a new DwField object (representing a new header field) to the DwHeaders object (representing the header), the is-modified flag will be set for the DwHeaders object, indicating that the string representation of the DwHeaders object will have to be re-assembled -from the header fields that it tqcontains. When a node's is-modified flag is +from the header fields that it contains. When a node's is-modified flag is set, it also notifies its tqparent node to set its is-modified flag. Thus, when the DwHeaders object's is-modified flag is set, the DwMessage object that is its tqparent will also have its is-modified flag set. That way, when diff --git a/mimelib/binhex.cpp b/mimelib/binhex.cpp index 6ea07961..735c08a3 100644 --- a/mimelib/binhex.cpp +++ b/mimelib/binhex.cpp @@ -662,14 +662,14 @@ int DwBinhex::Decode() DwBinhexDecodeCtx ctx; ctx.mBinhexChars = mBinhexChars; // Find the preamble - ctx.mPos = ctx.mBinhexChars.tqfind("(This file must be converted " + ctx.mPos = ctx.mBinhexChars.find("(This file must be converted " "with BinHex", 0); if (ctx.mPos == DwString::npos) { return -1; // error! } ctx.mPos += 40; // Advance to just past the colon - ctx.mPos = ctx.mBinhexChars.tqfind((char) ':', ctx.mPos); + ctx.mPos = ctx.mBinhexChars.find((char) ':', ctx.mPos); if (ctx.mPos == DwString::npos) { return -1; // error! } diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html index 5a5a413f..20a588d1 100644 --- a/mimelib/doc/addrlist.html +++ b/mimelib/doc/addrlist.html @@ -52,7 +52,7 @@ protected:

DwAddressList represents a list of addresses as described in RFC-822. In MIME++, DwAddressList is a container for objects -of type DwAddress, and it tqcontains +of type DwAddress, and it contains various member functions to manage its contained objects. DwAddressList is also a DwFieldBody. This reflects the diff --git a/mimelib/doc/body.html b/mimelib/doc/body.html index 06a3e822..fb6c42c0 100644 --- a/mimelib/doc/body.html +++ b/mimelib/doc/body.html @@ -176,7 +176,7 @@ is not the child of a DwEntity (i.e., be determined.

This function calls the Parse() member function of any -DwBodyPart or DwMessage object it tqcontains. +DwBodyPart or DwMessage object it contains.

You should call this member function after you add a DwBodyPart object to a multipart body, or add a @@ -219,7 +219,7 @@ returns the DwMessage encapsulated in it. aMessage)

For a DwBody with content type of message, this member function -sets the DwMessage object it tqcontains. +sets the DwMessage object it contains.

static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent) diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html index 4021b4de..93f281b5 100644 --- a/mimelib/doc/bodypart.html +++ b/mimelib/doc/bodypart.html @@ -47,7 +47,7 @@ of headers and a body. A body part is different from a message in that a body part is part of a multipart body.

In MIME++, a DwBodyPart is a subclass of -DwEntity; therefore, it tqcontains +DwEntity; therefore, it contains both a DwHeaders object and a DwBody object, and it is contained in a multipart DwBody object. diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html index c2f8d316..64a1cdbf 100644 --- a/mimelib/doc/entity.html +++ b/mimelib/doc/entity.html @@ -58,7 +58,7 @@ be a DwMessage object. If a DwEntity object is an intermediate node, its tqparent must be a DwBody object. The child nodes of a DwEntity object are the DwHeaders and -DwBody objects it tqcontains. +DwBody objects it contains.

Since DwEntity is an abstract base class, you cannot create instances of it directly. DwEntity has two derived classes, @@ -108,7 +108,7 @@ executes the parse method for DwEntity objects. The parse method creates or updates the broken-down representation from the string representation. For DwEntity objects, the parse method parses the string representation and sets the values of the -DwHeaders and DwBody objects it tqcontains. +DwHeaders and DwBody objects it contains. This member function also calls the Parse() member functions of the contained DwHeaders and DwBody objects.

diff --git a/mimelib/doc/field.html b/mimelib/doc/field.html index 68d4a9ed..c744877c 100644 --- a/mimelib/doc/field.html +++ b/mimelib/doc/field.html @@ -69,14 +69,14 @@ According to RFC-822, a field contains a field name and a field body. In MIME++, a DwField contains three elements: a DwString that contains its field name, a DwString that contains its field body, and a -DwFieldBody object that tqcontains +DwFieldBody object that contains a broken-down (that is, parsed) version of its field body.

In the tree (broken-down) representation of message, a DwField object is always an intermediate node, having a tqparent node and a single child node. The tqparent node is the -DwHeaders object that tqcontains -it. The child node is the DwFieldBody object it tqcontains. +DwHeaders object that contains +it. The child node is the DwFieldBody object it contains.

To get and set the field name, use the member functions FieldNameStr() and SetFieldNameStr(). To @@ -234,7 +234,7 @@ The static member function CreateFieldBody() is called from the Parse() member function and is responsible for creating a DwFieldBody object for this particular field. A typical scenario might go as follows: This member function examines the field name -for this field, finds that it tqcontains "To", creates a +for this field, finds that it contains "To", creates a DwAddressList object to contain the field body, calls the Parse() member function for the DwAddressList, and sets the DwAddressList diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html index 97b063ad..939b340e 100644 --- a/mimelib/doc/headers.html +++ b/mimelib/doc/headers.html @@ -167,7 +167,7 @@ but you access it through the Headers() member function of for you.

While DwHeaders has public member functions for managing -the list of DwField objects it tqcontains, you will normally +the list of DwField objects it contains, you will normally use convenience functions to access the field bodies of the header fields directly. You can access the field body for a specific well-known header field by using the member function diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html index 4a25dc4e..385bd8a2 100644 --- a/mimelib/doc/mailbox.html +++ b/mimelib/doc/mailbox.html @@ -66,7 +66,7 @@ deprecated according to RFC-1123. In MIME++, an RFC-822 mailbox is represented by a DwMailbox object. DwMailbox is a subclass of DwAddress, which reflects the -fact that a mailbox is also an address. A DwMailbox tqcontains +fact that a mailbox is also an address. A DwMailbox contains strings representing the full name, local-part, route, and domain of a mailbox.

In the tree (broken-down) representation of message, a @@ -77,7 +77,7 @@ but no child nodes. Its tqparent node must be a DwMailboxList object.

DwMailbox has member functions for getting or setting the -strings it tqcontains. +strings it contains.

DwMailbox object can be included in a list of DwMailbox objects. To get the next diff --git a/mimelib/doc/mboxlist.html b/mimelib/doc/mboxlist.html index e68b41e5..2bbe8d95 100644 --- a/mimelib/doc/mboxlist.html +++ b/mimelib/doc/mboxlist.html @@ -54,7 +54,7 @@ protected:

DwMailboxList represents a list of mailboxes as described in RFC-822. In MIME++, DwMailboxList is a container for objects -of type DwMailbox, and it tqcontains +of type DwMailbox, and it contains various member functions to manage its contained objects. DwAddressList is also a DwFieldBody. This reflects the diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html index 1a3892f7..bb3fcf22 100644 --- a/mimelib/doc/message.html +++ b/mimelib/doc/message.html @@ -44,7 +44,7 @@ A message contains both a collection of header fields and a body. In the terminology of RFC-2045, the general term for the headers-body combination is entity. In MIME++, DwMessage is a direct subclass of -DwEntity, and therefore tqcontains +DwEntity, and therefore contains both a DwHeaders object and a DwBody object.

@@ -52,7 +52,7 @@ In the tree (broken-down) representation of message, a DwMessage object is almost always a root node, having child nodes but no tqparent node. The child nodes are the DwHeaders object and the DwBody object it -tqcontains. A DwMessage may sometimes be an intermediate node. +contains. A DwMessage may sometimes be an intermediate node. In this special case, the tqparent node is a DwBody object of type "message/*" and the DwMessage object represents an encapsulated message. diff --git a/mimelib/doc/string.html b/mimelib/doc/string.html index fe16aed4..80db3700 100644 --- a/mimelib/doc/string.html +++ b/mimelib/doc/string.html @@ -59,25 +59,25 @@ public: DwString& insert(size_t aPos1, const char* aCstr); DwString& insert(size_t aPos1, size_t aLen2, char aChar); DwString& erase(size_t aPos=0, size_t aLen=npos); - DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr); - DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, + DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr); + DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2); - DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, + DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr); - DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr); + DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); size_t copy(char* aBuf, size_t aLen, size_t aPos=0) const; void swap(DwString& aStr); const char* c_str() const; const char* data() const; - size_t tqfind(const DwString& aStr, size_t aPos=0) const; - size_t tqfind(const char* aBuf, size_t aPos, size_t aLen) const; - size_t tqfind(const char* aCstr, size_t aPos=0) const; - size_t tqfind(char aChar, size_t aPos=0) const; - size_t rtqfind(const DwString& aStr, size_t aPos=npos) const; - size_t rtqfind(const char* aBuf, size_t aPos, size_t aLen) const; - size_t rtqfind(const char* aCstr, size_t aPos=npos) const; - size_t rtqfind(char aChar, size_t aPos=npos) const; + size_t find(const DwString& aStr, size_t aPos=0) const; + size_t find(const char* aBuf, size_t aPos, size_t aLen) const; + size_t find(const char* aCstr, size_t aPos=0) const; + size_t find(char aChar, size_t aPos=0) const; + size_t rfind(const DwString& aStr, size_t aPos=npos) const; + size_t rfind(const char* aBuf, size_t aPos, size_t aLen) const; + size_t rfind(const char* aCstr, size_t aPos=npos) const; + size_t rfind(char aChar, size_t aPos=npos) const; size_t find_first_of(const DwString& aStr, size_t aPos=0) const; size_t find_first_of(const char* aBuf, size_t aPos, size_t aLen) const; size_t find_first_of(const char* aCstr, size_t aPos=0) const; @@ -115,8 +115,8 @@ protected: size_t mStart; size_t mLength; void _copy(); - void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); + void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); friend void mem_free(char*); public: @@ -374,14 +374,14 @@ Erases (removes) at most aLen characters beginning at position aPos from this string. The function will not erase more characters than what are available. Returns *this.

- DwString& tqreplace(size_t + DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr)
-DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, +DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2)
-DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t +DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
-DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr)
-DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) +DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr)
+DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)

Removes aLen1 characters beginning at position @@ -441,11 +441,11 @@ The characters in the returned string should not be modified, and should be considered invalid after any call to a non-const member function or another call to c_str().

- size_t tqfind(const DwString& + size_t find(const DwString& aStr, size_t aPos=0) const
-size_t tqfind(const char* aBuf, size_t aPos, size_t aLen) const
-size_t tqfind(const char* aCstr, size_t aPos=0) const
-size_t tqfind(char aChar, size_t aPos=0) const +size_t find(const char* aBuf, size_t aPos, size_t aLen) const
+size_t find(const char* aCstr, size_t aPos=0) const
+size_t find(char aChar, size_t aPos=0) const

Performs a forward search for a sequence of characters in the DwString object. The return value is the position of the @@ -466,11 +466,11 @@ the sequence of characters in the NUL-terminated string The fourth version searches beginning at position aPos for the character aChar.

- size_t rtqfind(const DwString& + size_t rfind(const DwString& aStr, size_t aPos=npos) const
-size_t rtqfind(const char* aBuf, size_t aPos, size_t aLen) const
-size_t rtqfind(const char* aCstr, size_t aPos=npos) const
-size_t rtqfind(char aChar, size_t aPos=npos) const +size_t rfind(const char* aBuf, size_t aPos, size_t aLen) const
+size_t rfind(const char* aCstr, size_t aPos=npos) const
+size_t rfind(char aChar, size_t aPos=npos) const

Performs a reverse search for a sequence of characters in the DwString object. The return value is the position of the diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp index b8686e41..9a46bfa8 100644 --- a/mimelib/dwstring.cpp +++ b/mimelib/dwstring.cpp @@ -365,7 +365,7 @@ DwString::DwString(const char* aBuf, size_t aLen) mRep = new_rep_reference(sEmptyRep); mStart = 0; mLength = 0; - _tqreplace(0, mLength, aBuf, aLen); + _replace(0, mLength, aBuf, aLen); } @@ -400,7 +400,7 @@ DwString::DwString(const char* aCstr) mLength = 0; if ( aCstr ) { size_t len = strlen(aCstr); - _tqreplace(0, mLength, aCstr, len); + _replace(0, mLength, aCstr, len); } } @@ -418,7 +418,7 @@ DwString::DwString(size_t aLen, char aChar) mRep = new_rep_reference(sEmptyRep); mStart = 0; mLength = 0; - _tqreplace(0, mLength, aLen, aChar); + _replace(0, mLength, aLen, aChar); } @@ -476,7 +476,7 @@ void DwString::resize(size_t aLen, char aChar) } // expanding string else if (aLen > mLength) { - _tqreplace(mLength, 0, aLen-mLength, aChar); + _replace(mLength, 0, aLen-mLength, aChar); } } @@ -534,10 +534,10 @@ DwString& DwString::append(const DwString& aStr, size_t aPos, size_t len = DW_MIN(aLen, aStr.mLength - pos); if (&aStr == this) { DwString temp(aStr); - _tqreplace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len); + _replace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len); } else { - _tqreplace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len); + _replace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len); } return *this; } @@ -547,7 +547,7 @@ DwString& DwString::append(const char* aBuf, size_t aLen) { assert(aBuf != 0); if (aBuf != 0) { - _tqreplace(mLength, 0, aBuf, aLen); + _replace(mLength, 0, aBuf, aLen); } return *this; } @@ -557,14 +557,14 @@ DwString& DwString::append(const char* aCstr) { assert(aCstr != 0); size_t len = (aCstr) ? strlen(aCstr) : 0; - _tqreplace(mLength, 0, aCstr, len); + _replace(mLength, 0, aCstr, len); return *this; } DwString& DwString::append(size_t aLen, char aChar) { - _tqreplace(mLength, 0, aLen, aChar); + _replace(mLength, 0, aLen, aChar); return *this; } @@ -601,7 +601,7 @@ DwString& DwString::assign(const char* aBuf, size_t aLen) { assert(aBuf != 0); assert(aLen != (size_t)-1); - _tqreplace(0, mLength, aBuf, aLen); + _replace(0, mLength, aBuf, aLen); return *this; } @@ -610,7 +610,7 @@ DwString& DwString::assign(const char* aCstr) { assert(aCstr != 0); size_t len = (aCstr) ? strlen(aCstr) : 0; - _tqreplace(0, mLength, aCstr, len); + _replace(0, mLength, aCstr, len); return *this; } @@ -618,7 +618,7 @@ DwString& DwString::assign(const char* aCstr) DwString& DwString::assign(size_t aLen, char aChar) { assert(aLen != (size_t)-1); - _tqreplace(0, mLength, aLen, aChar); + _replace(0, mLength, aLen, aChar); return *this; } @@ -638,10 +638,10 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr, size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2); if (&aStr == this) { DwString temp(aStr); - _tqreplace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2); + _replace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2); } else { - _tqreplace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); + _replace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); } return *this; } @@ -650,7 +650,7 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr, DwString& DwString::insert(size_t aPos, const char* aBuf, size_t aLen) { assert(aBuf != 0); - _tqreplace(aPos, 0, aBuf, aLen); + _replace(aPos, 0, aBuf, aLen); return *this; } @@ -659,14 +659,14 @@ DwString& DwString::insert(size_t aPos, const char* aCstr) { assert(aCstr != 0); size_t len = (aCstr) ? strlen(aCstr) : 0; - _tqreplace(aPos, 0, aCstr, len); + _replace(aPos, 0, aCstr, len); return *this; } DwString& DwString::insert(size_t aPos, size_t aLen, char aChar) { - _tqreplace(aPos, 0, aLen, aChar); + _replace(aPos, 0, aLen, aChar); return *this; } @@ -676,18 +676,18 @@ DwString& DwString::erase(size_t aPos, size_t aLen) assert(aPos <= mLength); size_t pos = DW_MIN(aPos, mLength); size_t len = DW_MIN(aLen, mLength - pos); - _tqreplace(pos, len, "", 0); + _replace(pos, len, "", 0); return *this; } -DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr) +DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr) { - return tqreplace(aPos1, aLen1, aStr, 0, aStr.mLength); + return replace(aPos1, aLen1, aStr, 0, aStr.mLength); } -DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, +DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2) { assert(aPos2 <= aStr.mLength); @@ -695,35 +695,35 @@ DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2); if (&aStr == this) { DwString temp(aStr); - _tqreplace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2); + _replace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2); } else { - _tqreplace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); + _replace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); } return *this; } -DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, +DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) { - _tqreplace(aPos1, aLen1, aBuf, aLen2); + _replace(aPos1, aLen1, aBuf, aLen2); return *this; } -DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aCstr) +DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aCstr) { size_t len2 = (aCstr) ? strlen(aCstr) : 0; - _tqreplace(aPos1, aLen1, aCstr, len2); + _replace(aPos1, aLen1, aCstr, len2); return *this; } -DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, +DwString& DwString::replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) { - _tqreplace(aPos1, aLen1, aLen2, aChar); + _replace(aPos1, aLen1, aLen2, aChar); return *this; } @@ -755,13 +755,13 @@ void DwString::swap(DwString& aStr) } -size_t DwString::tqfind(const DwString& aStr, size_t aPos) const +size_t DwString::find(const DwString& aStr, size_t aPos) const { - return tqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); + return find(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); } -size_t DwString::tqfind(const char* aBuf, size_t aPos, size_t aLen) const +size_t DwString::find(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::tqfind(const char* aBuf, size_t aPos, size_t aLen) const } -size_t DwString::tqfind(const char* aCstr, size_t aPos) const +size_t DwString::find(const char* aCstr, size_t aPos) const { assert(aCstr != 0); if (aCstr == 0) return (size_t)-1; size_t len = strlen(aCstr); - return tqfind(aCstr, aPos, len); + return find(aCstr, aPos, len); } -size_t DwString::tqfind(char aChar, size_t aPos) const +size_t DwString::find(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::tqfind(char aChar, size_t aPos) const } -size_t DwString::rtqfind(const DwString& aStr, size_t aPos) const +size_t DwString::rfind(const DwString& aStr, size_t aPos) const { - return rtqfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); + return rfind(&aStr.mRep->mBuffer[aStr.mStart], aPos, aStr.mLength); } -size_t DwString::rtqfind(const char* aBuf, size_t aPos, size_t aLen) const +size_t DwString::rfind(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::rtqfind(const char* aBuf, size_t aPos, size_t aLen) const } -size_t DwString::rtqfind(const char* aCstr, size_t aPos) const +size_t DwString::rfind(const char* aCstr, size_t aPos) const { assert(aCstr != 0); size_t len = (aCstr) ? strlen(aCstr) : 0; - return rtqfind(aCstr, aPos, len); + return rfind(aCstr, aPos, len); } -size_t DwString::rtqfind(char aChar, size_t aPos) const +size_t DwString::rfind(char aChar, size_t aPos) const { size_t pos = DW_MIN(aPos, mLength - 1); const char* buf = mRep->mBuffer + mStart; @@ -1246,7 +1246,7 @@ void DwString::_copy() } -void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) +void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) { assert(aPos1 <= mLength); assert(aBuf != 0); @@ -1338,7 +1338,7 @@ void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t a } -void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) +void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) { assert(aPos1 <= mLength); size_t pos1 = DW_MIN(aPos1, mLength); diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h index d62cb608..129c19dc 100644 --- a/mimelib/mimelib/body.h +++ b/mimelib/mimelib/body.h @@ -152,7 +152,7 @@ public: //. be determined. //. //. This function calls the {\tt Parse()} member function of any - //. {\tt DwBodyPart} or {\tt DwMessage} object it tqcontains. + //. {\tt DwBodyPart} or {\tt DwMessage} object it contains. //. //. You should call this member function after you add a {\tt DwBodyPart} //. object to a multipart body, or add a {\tt DwMessage} object to a @@ -189,7 +189,7 @@ public: void SetMessage(DwMessage* aMessage); //. For a {\tt DwBody} with content type of message, this member function - //. sets the {\tt DwMessage} object it tqcontains. + //. sets the {\tt DwMessage} object it contains. static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent); //. Creates a new {\tt DwBody} object on the free store. diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h index d1f60e7f..1f2c3f6d 100644 --- a/mimelib/mimelib/entity.h +++ b/mimelib/mimelib/entity.h @@ -53,7 +53,7 @@ class DwBody; //. A {\tt DwEntity} object that is a root node must also be a {\tt DwMessage} //. object. If a {\tt DwEntity} object is an intermediate node, its tqparent //. must be a {\tt DwBody} object. The child nodes of a {\tt DwEntity} -//. object are the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. +//. object are the {\tt DwHeaders} and {\tt DwBody} objects it contains. //. //. Since {\tt DwEntity} is an abstract base class, you cannot create //. instances of it directly. {\tt DwEntity} has two derived classes, @@ -101,7 +101,7 @@ public: //. method creates or updates the broken-down representation from the //. string representation. For {\tt DwEntity} objects, the parse //. method parses the string representation and sets the values of - //. the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. This + //. the {\tt DwHeaders} and {\tt DwBody} objects it contains. This //. member function also calls the {\tt Parse()} member functions //. of the contained {\tt DwHeaders} and {\tt DwBody} objects. //. diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h index 70f58466..eac95494 100644 --- a/mimelib/mimelib/field.h +++ b/mimelib/mimelib/field.h @@ -52,8 +52,8 @@ class DwFieldBody; //. //. In the tree (broken-down) representation of message, a {\tt DwField} //. object is always an intermediate node, having a tqparent node and a single -//. child node. The tqparent node is the {\tt DwHeaders} object that tqcontains -//. it. The child node is the {\tt DwFieldBody} object it tqcontains. +//. child node. The tqparent node is the {\tt DwHeaders} object that contains +//. it. The child node is the {\tt DwFieldBody} object it contains. //. //. To get and set the field name, use the member functions //. {\tt FieldNameStr()} and {\tt SetFieldNameStr()}. @@ -190,7 +190,7 @@ public: //. {\tt DwFieldBody} object for this particular field. A typical //. scenario might go as follows: //. This member function examines the field name for this field, - //. finds that it tqcontains "To", creates a {\tt DwAddressList} object + //. finds that it contains "To", creates a {\tt DwAddressList} object //. to contain the field body, calls the {\tt Parse()} member //. function for the {\tt DwAddressList}, and sets the {\tt DwAddressList} //. object as this {\tt DwField} object's {\tt DwFieldBody}. diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h index 6598cc52..a2011776 100644 --- a/mimelib/mimelib/headers.h +++ b/mimelib/mimelib/headers.h @@ -87,7 +87,7 @@ class DwText; //. //. In the tree (broken-down) representation of a message, a {\tt DwHeaders} //. object is an intermediate node, having both a tqparent node and several -//. child nodes. The tqparent node is the {\tt DwEntity} object that tqcontains +//. child nodes. The tqparent node is the {\tt DwEntity} object that contains //. it. The child nodes are the {\tt DwField} objects in the list it manages. //. (See the man page for {\tt DwMessageComponent} for a discussion of //. the tree representation of a message.) @@ -97,7 +97,7 @@ class DwText; //. which creates the {\tt DwHeaders} object for you. //. //. While {\tt DwHeaders} has public member functions for managing the list -//. of {\tt DwField} objects it tqcontains, you will normally use convenience +//. of {\tt DwField} objects it contains, you will normally use convenience //. functions to access the field bodies of the header fields directly. //. You can access the field body for a specific well-known header field //. by using the member function {\tt ()}, where {\tt } is diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h index 0d158ecf..f118e38e 100644 --- a/mimelib/mimelib/mailbox.h +++ b/mimelib/mimelib/mailbox.h @@ -41,7 +41,7 @@ //+ Description //. RFC-822 defines a {\it mailbox} as an entity that can be the recipient //. of a message. A mailbox is more specific than an {\it address}, which -//. may be either a mailbox or a {\it group}. An RFC-822 mailbox tqcontains +//. may be either a mailbox or a {\it group}. An RFC-822 mailbox contains //. a full name, a {\it local-part}, an optional {\it route}, and a //. {\it domain}. For example, in the mailbox //. @@ -53,7 +53,7 @@ //. //. In MIME++, an RFC-822 mailbox is represented by a {\tt DwMailbox} object. //. {\tt DwMailbox} is a subclass of {\tt DwAddress}, which reflects the -//. fact that a mailbox is also an address. A {\tt DwMailbox} tqcontains +//. fact that a mailbox is also an address. A {\tt DwMailbox} contains //. strings representing the full name, local-part, route, and domain //. of a mailbox. //. @@ -63,7 +63,7 @@ //. {\tt DwMailboxList} object. //. //. {\tt DwMailbox} has member functions for getting or setting the strings -//. it tqcontains. +//. it contains. //. //. {\tt DwMailbox} object can be included in a list of {\tt DwMailbox} //. objects. To get the next {\tt DwMailbox} object in a list, use the diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h index 8ce31abc..3cfac701 100644 --- a/mimelib/mimelib/message.h +++ b/mimelib/mimelib/message.h @@ -45,7 +45,7 @@ //. In the tree (broken-down) representation of message, a {\tt DwMessage} //. object is almost always a root node, having child nodes but no tqparent node. //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object -//. it tqcontains. A {\tt DwMessage} may sometimes be an intermediate node. In +//. it contains. A {\tt DwMessage} may sometimes be an intermediate node. In //. this special case, the tqparent node is a {\tt DwBody} object of type //. "message/*" and the {\tt DwMessage} object represents an encapsulated //. message. diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h index 556d6794..35cf4f8d 100644 --- a/mimelib/mimelib/string.h +++ b/mimelib/mimelib/string.h @@ -285,13 +285,13 @@ public: //. available. //. Returns {\tt *this}. - DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr); - DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, + DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr); + DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2); - DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, + DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr); - DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr); + DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); //. Removes {\tt aLen1} characters beginning at position {\tt aPos1} //. and inserts other characters. //. Returns {\tt *this}. @@ -338,10 +338,10 @@ public: //. should be considered invalid after any call to a non-const member //. function or another call to {\tt c_str()}. - size_t tqfind(const DwString& aStr, size_t aPos=0) const; - size_t tqfind(const char* aBuf, size_t aPos, size_t aLen) const; - size_t tqfind(const char* aCstr, size_t aPos=0) const; - size_t tqfind(char aChar, size_t aPos=0) const; + size_t find(const DwString& aStr, size_t aPos=0) const; + size_t find(const char* aBuf, size_t aPos, size_t aLen) const; + size_t find(const char* aCstr, size_t aPos=0) const; + size_t find(char aChar, size_t aPos=0) const; //. Performs a forward search for a sequence of characters in the //. {\tt DwString} object. The return value is the position of the //. sequence in the string if found, or {\tt DwString::npos} if not @@ -360,10 +360,10 @@ public: //. The fourth version searches beginning at position {\tt aPos} for //. the character {\tt aChar}. - size_t rtqfind(const DwString& aStr, size_t aPos=npos) const; - size_t rtqfind(const char* aBuf, size_t aPos, size_t aLen) const; - size_t rtqfind(const char* aCstr, size_t aPos=npos) const; - size_t rtqfind(char aChar, size_t aPos=npos) const; + size_t rfind(const DwString& aStr, size_t aPos=npos) const; + size_t rfind(const char* aBuf, size_t aPos, size_t aLen) const; + size_t rfind(const char* aCstr, size_t aPos=npos) const; + size_t rfind(char aChar, size_t aPos=npos) const; //. Performs a reverse search for a sequence of characters in the //. {\tt DwString} object. The return value is the position of the //. sequence in the string if found, or {\tt DwString::npos} if not @@ -557,8 +557,8 @@ protected: size_t mLength; void _copy(); - void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); + void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); private: static const size_t kEmptyBufferSize; -- cgit v1.2.3