From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mimelib/basicmsg.h | 2 +- mimelib/doc/addrlist.html | 2 +- mimelib/doc/body.html | 16 +++++------ mimelib/doc/bodypart.html | 4 +-- mimelib/doc/entity.html | 6 ++--- mimelib/doc/field.html | 18 ++++++------- mimelib/doc/fieldbdy.html | 2 +- mimelib/doc/group.html | 4 +-- mimelib/doc/headers.html | 8 +++--- mimelib/doc/mailbox.html | 6 ++--- mimelib/doc/mboxlist.html | 2 +- mimelib/doc/mediatyp.html | 2 +- mimelib/doc/message.html | 6 ++--- mimelib/doc/msgcmp.html | 2 +- mimelib/doc/msgid.html | 2 +- mimelib/doc/string.html | 26 +++++++++--------- mimelib/dwstring.cpp | 66 +++++++++++++++++++++++----------------------- mimelib/headers.cpp | 2 +- mimelib/mimelib/addrlist.h | 2 +- mimelib/mimelib/body.h | 16 +++++------ mimelib/mimelib/bodypart.h | 4 +-- mimelib/mimelib/entity.h | 6 ++--- mimelib/mimelib/field.h | 16 +++++------ mimelib/mimelib/fieldbdy.h | 2 +- mimelib/mimelib/group.h | 4 +-- mimelib/mimelib/headers.h | 8 +++--- mimelib/mimelib/mailbox.h | 6 ++--- mimelib/mimelib/mboxlist.h | 2 +- mimelib/mimelib/mediatyp.h | 2 +- mimelib/mimelib/message.h | 6 ++--- mimelib/mimelib/msgcmp.h | 4 +-- mimelib/mimelib/msgid.h | 2 +- mimelib/mimelib/nntp.h | 2 +- mimelib/mimelib/string.h | 18 ++++++------- mimelib/multipar.cpp | 2 +- mimelib/nntp.cpp | 42 ++++++++++++++--------------- 36 files changed, 160 insertions(+), 160 deletions(-) (limited to 'mimelib') diff --git a/mimelib/basicmsg.h b/mimelib/basicmsg.h index d578a758..eca41518 100644 --- a/mimelib/basicmsg.h +++ b/mimelib/basicmsg.h @@ -25,7 +25,7 @@ // library easier to use. Second, it provides good example code to show // you how to create your own customized wrapper classes. -// BasicMessage contains a DwMessage by reference. The reason BasicMessage +// BasicMessage tqcontains a DwMessage by reference. The reason BasicMessage // "has-a" DwMessage and not "is-a" DwMessage is because we can assign // the DwMessage to an appropriately specialized subclass of BasicMessage // *after* the DwMessage is parsed. For example, after we parse a DwMessage, diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html index d3a563ee..80845fc0 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 contains +of type DwAddress, and it tqcontains 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 1526751a..c9856e24 100644 --- a/mimelib/doc/body.html +++ b/mimelib/doc/body.html @@ -65,9 +65,9 @@ protected: A body is always part of an entity, which could be either a message or a body part. An entity has a collection of header fields and a body. If the content type of a body is ``multipart,'' then -the body contains one or more body parts. If the content type is ``message,'' -then the body contains an encapsulated message. In all content types, the -body contains a string of characters. +the body tqcontains one or more body parts. If the content type is ``message,'' +then the body tqcontains an encapsulated message. In all content types, the +body tqcontains a string of characters.

In MIME++, a DwBody object is contained in a DwEntity object. The @@ -79,7 +79,7 @@ or a single contained way to determine the type of DwBody is to access the Content-Type header field from the DwHeaders object of the -DwEntity that contains it. For this reason, a +DwEntity that tqcontains it. For this reason, a DwBody should always be part of a DwEntity.

@@ -87,7 +87,7 @@ In the tree (broken-down) representation of a message, a DwBody object can be an intermediate node, having both a parent node and one or more child nodes, or a leaf node, having a parent but no child nodes. In either case, the parent node is the -DwEntity object that contains it. If it is an intermediate +DwEntity object that tqcontains it. If it is an intermediate node, it must be of type multipart with DwBodyPart objects as child nodes, or of type message with a single DwMessage object as its child node. @@ -169,14 +169,14 @@ method creates or updates the string representation from the broken-down representation. Only DwBody objects with content type of multipart or message require assembling. In either case, the DwBody object must be able to find the headers of the message -or body part that contains it. Therefore, if the DwBody object +or body part that tqcontains it. Therefore, if the DwBody object is not the child of a DwEntity (i.e., DwMessage or DwBodyPart) object, the DwBody cannot be assembled because the content type cannot be determined.

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

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 contains. +sets the DwMessage object it tqcontains.

static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent) diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html index 6a3a29b6..c74f716f 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 contains +DwEntity; therefore, it tqcontains both a DwHeaders object and a DwBody object, and it is contained in a multipart DwBody object. @@ -120,7 +120,7 @@ This advanced function sets aPart as the next DwBodyPart object following this DwBodyPart in the list of DwBodyPart objects contained in a multipart DwBody. Since -DwBody contains a member function for adding a +DwBody tqcontains a member function for adding a DwBodyPart object to its list, this function should be avoided for most applications.

diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html index 08cf8b75..9a2d0018 100644 --- a/mimelib/doc/entity.html +++ b/mimelib/doc/entity.html @@ -47,7 +47,7 @@ protected: RFC-2045 defines an entity as either a message or a body part, both of which have a collection of headers and a body. In MIME++, an entity is represented by the class DwEntity, which -contains both a DwHeaders object +tqcontains both a DwHeaders object and a DwBody object.

In the tree (broken-down) representation of message, a @@ -58,7 +58,7 @@ be a DwMessage object. If a DwEntity object is an intermediate node, its parent must be a DwBody object. The child nodes of a DwEntity object are the DwHeaders and -DwBody objects it contains. +DwBody objects it tqcontains.

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 contains. +DwHeaders and DwBody objects it tqcontains. 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 19736f27..1a4a74b9 100644 --- a/mimelib/doc/field.html +++ b/mimelib/doc/field.html @@ -65,18 +65,18 @@ protected:

DwField represents a header field as described in RFC-822. -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 contains +According to RFC-822, a field tqcontains a field name and a field body. In +MIME++, a DwField tqcontains three elements: a +DwString that tqcontains its field +name, a DwString that tqcontains its field body, and a +DwFieldBody object that tqcontains 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 parent node and a single child node. The parent node is the -DwHeaders object that contains -it. The child node is the DwFieldBody object it contains. +DwHeaders object that tqcontains +it. The child node is the DwFieldBody object it tqcontains.

To get and set the field name, use the member functions FieldNameStr() and SetFieldNameStr(). To @@ -212,7 +212,7 @@ aField)

This advanced function sets aField as the next field following this field in the list of fields contained in the headers. Since -DwHeaders contains member functions for adding +DwHeaders tqcontains member functions for adding DwField objects to its list, this function should be avoided for most applications.

@@ -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 contains "To", creates a +for this field, finds that it tqcontains "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/fieldbdy.html b/mimelib/doc/fieldbdy.html index 856fd533..47b9a6ac 100644 --- a/mimelib/doc/fieldbdy.html +++ b/mimelib/doc/fieldbdy.html @@ -53,7 +53,7 @@ In the tree (broken-down) representation of a message, a DwFieldBody object may be either a leaf node, having a parent but no child nodes, or an intermediate node, having a parent and one or more child nodes. The parent node is the -DwField object that contains it. +DwField object that tqcontains it. Child nodes, if present, depend on the particular subclass of DwFieldBody that is instantiated. A DwAddressList object, for example, has diff --git a/mimelib/doc/group.html b/mimelib/doc/group.html index 1d374d87..683ff3a9 100644 --- a/mimelib/doc/group.html +++ b/mimelib/doc/group.html @@ -51,8 +51,8 @@ protected:

DwGroup represents a group as described in RFC-822. -A group contains a group name and a (possibly empty) list of -mailboxes. In MIME++, a DwGroup object contains a +A group tqcontains a group name and a (possibly empty) list of +mailboxes. In MIME++, a DwGroup object tqcontains a string for the group name and a DwMailboxList object for the list of mailboxes. diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html index 8bf94ad9..35519c39 100644 --- a/mimelib/doc/headers.html +++ b/mimelib/doc/headers.html @@ -155,7 +155,7 @@ the individual header fields. In the tree (broken-down) representation of a message, a DwHeaders object is an intermediate node, having both a parent node and several child nodes. The parent node is the -DwEntity object that contains it. +DwEntity object that tqcontains it. The child nodes are the DwField objects in the list it manages. (See the man page for DwMessageComponent for a discussion @@ -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 contains, you will normally +the list of DwField objects it tqcontains, 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 @@ -416,7 +416,7 @@ function: most applications should use the

Adds a DwField object to the list. If a header field with -the same field name already exists, it is replaced by the new header field. +the same field name already exists, it is tqreplaced by the new header field.

DwHeaders takes responsibility for deleting the added DwField object. @@ -430,7 +430,7 @@ to add header fields.

Adds a DwField object to the list. If a header field with -the same field name already exists, it is not replaced; thus, duplicate +the same field name already exists, it is not tqreplaced; thus, duplicate header fields may occur when using this member function. (This is what you want for some header fields, such as the "Received" header field).

diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html index 492070cc..72b509cd 100644 --- a/mimelib/doc/mailbox.html +++ b/mimelib/doc/mailbox.html @@ -53,7 +53,7 @@ protected:

RFC-822 defines a mailbox as an entity that can be the recipient of a message. A mailbox is more specific than an address, which may be -either a mailbox or a group. An RFC-822 mailbox contains a full name, +either a mailbox or a group. An RFC-822 mailbox tqcontains a full name, a local-part, an optional route, and a domain. For example, in the mailbox

@@ -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 contains +fact that a mailbox is also an address. A DwMailbox tqcontains 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 parent node must be a DwMailboxList object.

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

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 2bae2b4e..541eae28 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 contains +of type DwMailbox, and it tqcontains various member functions to manage its contained objects. DwAddressList is also a DwFieldBody. This reflects the diff --git a/mimelib/doc/mediatyp.html b/mimelib/doc/mediatyp.html index 01696084..83e5c127 100644 --- a/mimelib/doc/mediatyp.html +++ b/mimelib/doc/mediatyp.html @@ -84,7 +84,7 @@ type model.

DwMediaType has member functions that allow you to set or get the type and subtype as either enumerated values or as strings. It also -contains a list of +tqcontains a list of DwParameter objects that represent the parameters of the field body. You can use convenience functions to directly access the boundary parameter of a multipart media type, or to access the diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html index d08d5af4..193236f8 100644 --- a/mimelib/doc/message.html +++ b/mimelib/doc/message.html @@ -40,11 +40,11 @@ protected:

DwMessage represents an RFC-822/MIME message.

-A message contains both a collection of header fields and a +A message tqcontains 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 contains +DwEntity, and therefore tqcontains 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 parent node. The child nodes are the DwHeaders object and the DwBody object it -contains. A DwMessage may sometimes be an intermediate node. +tqcontains. A DwMessage may sometimes be an intermediate node. In this special case, the parent node is a DwBody object of type "message/*" and the DwMessage object represents an encapsulated message. diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html index 48a7ab54..2469c371 100644 --- a/mimelib/doc/msgcmp.html +++ b/mimelib/doc/msgcmp.html @@ -133,7 +133,7 @@ These features are the following: A parent. Most message components are part of another component. A collection of headers is part of a message or body part, a header field is part of a collection of headers, a field-body is part of a header field, and so on. - The parent of a component is the component that contains it. This tree structure + The parent of a component is the component that tqcontains it. This tree structure is important, since a component's parent must be parsed before the component can be. Also, a component's string representation must be assembled before its parent's. To maintain consistency in the tree, whenever a component's diff --git a/mimelib/doc/msgid.html b/mimelib/doc/msgid.html index 69d10ef5..da64d38a 100644 --- a/mimelib/doc/msgid.html +++ b/mimelib/doc/msgid.html @@ -49,7 +49,7 @@ protected:

DwMsgId represents a msg-id as described in RFC-822. In the BNF grammar in RFC-822, a msg-id has a local-part and a -domain. In MIME++, a DwMsgId contains strings that +domain. In MIME++, a DwMsgId tqcontains strings that contain the local-part and the domain.

In the tree (broken-down) representation of message, a diff --git a/mimelib/doc/string.html b/mimelib/doc/string.html index 80db3700..7c2f4f23 100644 --- a/mimelib/doc/string.html +++ b/mimelib/doc/string.html @@ -59,13 +59,13 @@ 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& replace(size_t aPos1, size_t aLen1, const DwString& aStr); - DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, + DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr); + DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2); - DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, + DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr); - DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr); + DwString& tqreplace(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; @@ -115,8 +115,8 @@ protected: size_t mStart; size_t mLength; void _copy(); - 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); + 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); 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& replace(size_t + DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr)
-DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, +DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2)
-DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t +DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
-DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr)
-DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) +DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr)
+DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)

Removes aLen1 characters beginning at position @@ -579,7 +579,7 @@ The third version searches for any character not in the NUL-terminated string DwString substr(size_t aPos=0, size_t aLen=npos) const

-Returns a string that contains at most aLen characters from +Returns a string that tqcontains at most aLen characters from the DwString object beginning at position aPos. The returned substring will not contain more characters than what are available in the superstring DwString object. diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp index 749f7c8e..52e42bef 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; - _replace(0, mLength, aBuf, aLen); + _tqreplace(0, mLength, aBuf, aLen); } @@ -400,7 +400,7 @@ DwString::DwString(const char* aCstr) mLength = 0; if ( aCstr ) { size_t len = strlen(aCstr); - _replace(0, mLength, aCstr, len); + _tqreplace(0, mLength, aCstr, len); } } @@ -418,7 +418,7 @@ DwString::DwString(size_t aLen, char aChar) mRep = new_rep_reference(sEmptyRep); mStart = 0; mLength = 0; - _replace(0, mLength, aLen, aChar); + _tqreplace(0, mLength, aLen, aChar); } @@ -476,7 +476,7 @@ void DwString::resize(size_t aLen, char aChar) } // expanding string else if (aLen > mLength) { - _replace(mLength, 0, aLen-mLength, aChar); + _tqreplace(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); - _replace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len); + _tqreplace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len); } else { - _replace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len); + _tqreplace(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) { - _replace(mLength, 0, aBuf, aLen); + _tqreplace(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; - _replace(mLength, 0, aCstr, len); + _tqreplace(mLength, 0, aCstr, len); return *this; } DwString& DwString::append(size_t aLen, char aChar) { - _replace(mLength, 0, aLen, aChar); + _tqreplace(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); - _replace(0, mLength, aBuf, aLen); + _tqreplace(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; - _replace(0, mLength, aCstr, len); + _tqreplace(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); - _replace(0, mLength, aLen, aChar); + _tqreplace(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); - _replace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2); + _tqreplace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2); } else { - _replace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); + _tqreplace(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); - _replace(aPos, 0, aBuf, aLen); + _tqreplace(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; - _replace(aPos, 0, aCstr, len); + _tqreplace(aPos, 0, aCstr, len); return *this; } DwString& DwString::insert(size_t aPos, size_t aLen, char aChar) { - _replace(aPos, 0, aLen, aChar); + _tqreplace(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); - _replace(pos, len, "", 0); + _tqreplace(pos, len, "", 0); return *this; } -DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr) +DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr) { - return replace(aPos1, aLen1, aStr, 0, aStr.mLength); + return tqreplace(aPos1, aLen1, aStr, 0, aStr.mLength); } -DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr, +DwString& DwString::tqreplace(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::replace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2); if (&aStr == this) { DwString temp(aStr); - _replace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2); + _tqreplace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2); } else { - _replace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); + _tqreplace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2); } return *this; } -DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aBuf, +DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) { - _replace(aPos1, aLen1, aBuf, aLen2); + _tqreplace(aPos1, aLen1, aBuf, aLen2); return *this; } -DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aCstr) +DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aCstr) { size_t len2 = (aCstr) ? strlen(aCstr) : 0; - _replace(aPos1, aLen1, aCstr, len2); + _tqreplace(aPos1, aLen1, aCstr, len2); return *this; } -DwString& DwString::replace(size_t aPos1, size_t aLen1, size_t aLen2, +DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) { - _replace(aPos1, aLen1, aLen2, aChar); + _tqreplace(aPos1, aLen1, aLen2, aChar); return *this; } @@ -1246,7 +1246,7 @@ void DwString::_copy() } -void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) +void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2) { assert(aPos1 <= mLength); assert(aBuf != 0); @@ -1291,7 +1291,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe } } } - // Is the replacement smaller than the replaced? + // Is the tqreplacement smaller than the tqreplaced? else if (len2 < len1) { to = mRep->mBuffer + mStart + pos1; from = aBuf; @@ -1338,7 +1338,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe } -void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) +void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) { assert(aPos1 <= mLength); size_t pos1 = DW_MIN(aPos1, mLength); @@ -1381,7 +1381,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar) } } } - // Is the replacement smaller than the replaced? + // Is the tqreplacement smaller than the tqreplaced? else if (len2 < len1) { to = mRep->mBuffer + mStart + pos1; for (i=0; i < len2; ++i) *to++ = aChar; diff --git a/mimelib/headers.cpp b/mimelib/headers.cpp index 7598ec7e..58846188 100644 --- a/mimelib/headers.cpp +++ b/mimelib/headers.cpp @@ -336,7 +336,7 @@ void DwHeaders::AddOrReplaceField(DwField* aField) mFirstField = aField; } aField->SetNext(field->Next()); - // Check whether we've replaced the last field + // Check whether we've tqreplaced the last field if ( !aField->Next() ) mLastField = aField; delete field; diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h index 5d26736a..1225494d 100644 --- a/mimelib/mimelib/addrlist.h +++ b/mimelib/mimelib/addrlist.h @@ -32,7 +32,7 @@ //+ Description //. {\tt DwAddressList} represents a list of {\it addresses} as described //. in RFC-822. In MIME++, {\tt DwAddressList} is a container for objects -//. of type {\tt DwAddress}, and it contains various member functions +//. of type {\tt DwAddress}, and it tqcontains various member functions //. to manage its contained objects. {\tt DwAddressList} is also a //. {\tt DwFieldBody}. This reflects the fact that certain RFC-822 header //. fields, such as the ``To'' header field, have a list of addresses diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h index 2133a724..f19efa0c 100644 --- a/mimelib/mimelib/body.h +++ b/mimelib/mimelib/body.h @@ -46,9 +46,9 @@ class DwBodyPart; //. is always part of an {\it entity}, which could be either a {\it message} //. or a {\it body part}. An entity has a collection of {\it header fields} //. and a body. If the content type of a body is ``multipart,'' then the -//. body contains one or more body parts. If the content type is ``message,'' -//. then the body contains an encapsulated message. In all content types, -//. the body contains a string of characters. +//. body tqcontains one or more body parts. If the content type is ``message,'' +//. then the body tqcontains an encapsulated message. In all content types, +//. the body tqcontains a string of characters. //. //. In MIME++, a {\tt DwBody} object is contained in a {\tt DwEntity} object. //. The {\tt DwBody} object may contain a discrete body consisting only of a @@ -56,14 +56,14 @@ class DwBodyPart; //. contained {\tt DwBodyPart} objects or a single contained {\tt DwMessage} //. object. The only reliable way to determine the type of {\tt DwBody} is //. to access the Content-Type header field from the {\tt DwHeaders} object -//. of the {\tt DwEntity} that contains it. For this reason, a {\tt DwBody} +//. of the {\tt DwEntity} that tqcontains it. For this reason, a {\tt DwBody} //. should always be part of a {\tt DwEntity}. //. //. In the tree (broken-down) representation of a message, a {\tt DwBody} //. object can be an intermediate node, having both a parent node and //. one or more child nodes, or a leaf node, having a parent but no child //. nodes. In either case, the parent node is the {\tt DwEntity} object -//. that contains it. If it is an intermediate node, it must be of type +//. that tqcontains it. If it is an intermediate node, it must be of type //. multipart with {\tt DwBodyPart} objects as child nodes, or of type //. message with a single {\tt DwMessage} object as its child node. //. @@ -145,14 +145,14 @@ public: //. from the broken-down representation. Only {\tt DwBody} objects //. with content type of multipart or message require assembling. //. In either case, the {\tt DwBody} object must be able to find the - //. headers of the message or body part that contains it. Therefore, + //. headers of the message or body part that tqcontains it. Therefore, //. if the {\tt DwBody} object is not the child of a {\tt DwEntity} //. ({\it i.e.}, {\tt DwMessage} or {\tt DwBodyPart}) object, the //. {\tt DwBody} cannot be assembled because the content type cannot //. be determined. //. //. This function calls the {\tt Parse()} member function of any - //. {\tt DwBodyPart} or {\tt DwMessage} object it contains. + //. {\tt DwBodyPart} or {\tt DwMessage} object it tqcontains. //. //. 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 contains. + //. sets the {\tt DwMessage} object it tqcontains. static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent); //. Creates a new {\tt DwBody} object on the free store. diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h index 9ed7f672..78e0db59 100644 --- a/mimelib/mimelib/bodypart.h +++ b/mimelib/mimelib/bodypart.h @@ -49,7 +49,7 @@ class DwBody; //. in that a body part is part of a multipart body. //. //. In MIME++, a {\tt DwBodyPart} is a subclass of {\tt DwEntity}; therefore, -//. it contains both a {\tt DwHeaders} object and a {\tt DwBody} object, +//. it tqcontains both a {\tt DwHeaders} object and a {\tt DwBody} object, //. and it is contained in a multipart {\tt DwBody} object. //. //. As with {\tt DwMessage}, most of the functionality of {\tt DwBodyPart} is @@ -114,7 +114,7 @@ public: //. This advanced function sets {\tt aPart} as the next {\tt DwBodyPart} //. object following this {\tt DwBodyPart} in the list of {\tt DwBodyPart} //. objects contained in a multipart {\tt DwBody}. Since {\tt DwBody} - //. contains a member function for adding a {\tt DwBodyPart} object to + //. tqcontains a member function for adding a {\tt DwBodyPart} object to //. its list, this function should be avoided for most applications. //+ Var sNewBodyPart diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h index e809c282..1bb4662b 100644 --- a/mimelib/mimelib/entity.h +++ b/mimelib/mimelib/entity.h @@ -44,7 +44,7 @@ class DwBody; //. RFC-2045 defines an {\it entity} as either a {\it message} or a //. {\it body part}, both of which have a collection of headers and //. a {\it body}. In MIME++, an entity is represented by the class -//. {\tt DwEntity}, which contains both a {\tt DwHeaders} object and +//. {\tt DwEntity}, which tqcontains both a {\tt DwHeaders} object and //. a {\tt DwBody} object. //. //. In the tree (broken-down) representation of message, a {\tt DwEntity} @@ -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 parent //. must be a {\tt DwBody} object. The child nodes of a {\tt DwEntity} -//. object are the {\tt DwHeaders} and {\tt DwBody} objects it contains. +//. object are the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. //. //. 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 contains. This + //. the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. 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 9ada823c..7cd8f97c 100644 --- a/mimelib/mimelib/field.h +++ b/mimelib/mimelib/field.h @@ -44,16 +44,16 @@ class DwFieldBody; //+ Name DwField -- Class representing a MIME header field //+ Description //. {\tt DwField} represents a header field as described in RFC-822. -//. According to RFC-822, a field contains a field name and a field body. -//. In MIME++, a {\tt DwField} contains three elements: a {\tt DwString} -//. that contains its field name, a {\tt DwString} that contains its -//. field body, and a {\tt DwFieldBody} object that contains a broken-down +//. According to RFC-822, a field tqcontains a field name and a field body. +//. In MIME++, a {\tt DwField} tqcontains three elements: a {\tt DwString} +//. that tqcontains its field name, a {\tt DwString} that tqcontains its +//. field body, and a {\tt DwFieldBody} object that tqcontains a broken-down //. (that is, parsed) version of its field body. //. //. In the tree (broken-down) representation of message, a {\tt DwField} //. object is always an intermediate node, having a parent node and a single -//. child node. The parent node is the {\tt DwHeaders} object that contains -//. it. The child node is the {\tt DwFieldBody} object it contains. +//. child node. The parent node is the {\tt DwHeaders} object that tqcontains +//. it. The child node is the {\tt DwFieldBody} object it tqcontains. //. //. To get and set the field name, use the member functions //. {\tt FieldNameStr()} and {\tt SetFieldNameStr()}. @@ -169,7 +169,7 @@ public: void SetNext(const DwField* aField); //. This {\it advanced} function sets {\tt aField} as the next field //. following this field in the list of fields contained in the headers. - //. Since {\tt DwHeaders} contains member functions for adding + //. Since {\tt DwHeaders} tqcontains member functions for adding //. {\tt DwField} objects to its list, this function should be //. avoided for most applications. @@ -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 contains "To", creates a {\tt DwAddressList} object + //. finds that it tqcontains "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/fieldbdy.h b/mimelib/mimelib/fieldbdy.h index e5f3243a..24a0c0b9 100644 --- a/mimelib/mimelib/fieldbdy.h +++ b/mimelib/mimelib/fieldbdy.h @@ -47,7 +47,7 @@ //. In the tree (broken-down) representation of a message, a {\tt DwFieldBody} //. object may be either a leaf node, having a parent but no child nodes, or //. an intermediate node, having a parent and one or more child nodes. The -//. parent node is the {\tt DwField} object that contains it. Child nodes, +//. parent node is the {\tt DwField} object that tqcontains it. Child nodes, //. if present, depend on the particular subclass of {\tt DwFieldBody} that //. is instantiated. A {\tt DwAddressList} object, for example, has //. {\tt DwAddress} objects as its child nodes. diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h index 21cf930b..ea0e7260 100644 --- a/mimelib/mimelib/group.h +++ b/mimelib/mimelib/group.h @@ -47,8 +47,8 @@ //+ Name DwGroup -- Class representing an RFC-822 address group //+ Description //. {\tt DwGroup} represents a {\it group} as described in RFC-822. A group -//. contains a group name and a (possibly empty) list of {\it mailboxes}. -//. In MIME++, a {\tt DwGroup} object contains a string for the group name +//. tqcontains a group name and a (possibly empty) list of {\it mailboxes}. +//. In MIME++, a {\tt DwGroup} object tqcontains a string for the group name //. and a {\tt DwMailboxList} object for the list of mailboxes. //. //. In the tree (broken-down) representation of message, a {\tt DwGroup} diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h index f545a3db..5debab9b 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 parent node and several -//. child nodes. The parent node is the {\tt DwEntity} object that contains +//. child nodes. The parent node is the {\tt DwEntity} object that tqcontains //. 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 contains, you will normally use convenience +//. of {\tt DwField} objects it tqcontains, 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 @@ -347,7 +347,7 @@ public: void AddOrReplaceField(DwField* aField); //. Adds a {\tt DwField} object to the list. If a header field with - //. the same field name already exists, it is replaced by the new + //. the same field name already exists, it is tqreplaced by the new //. header field. //. //. {\tt DwHeaders} takes responsibility for deleting the added @@ -359,7 +359,7 @@ public: void AddField(DwField* aField); //. Adds a {\tt DwField} object to the list. If a header field with - //. the same field name already exists, it is {\it not} replaced; + //. the same field name already exists, it is {\it not} tqreplaced; //. thus, duplicate header fields may occur when using this member //. function. (This is what you want for some header fields, such as //. the "Received" header field). diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h index 7e38ae4b..2ef28258 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 contains +//. may be either a mailbox or a {\it group}. An RFC-822 mailbox tqcontains //. 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} contains +//. fact that a mailbox is also an address. A {\tt DwMailbox} tqcontains //. 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 contains. +//. it tqcontains. //. //. {\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/mboxlist.h b/mimelib/mimelib/mboxlist.h index 723a8c55..adbd9363 100644 --- a/mimelib/mimelib/mboxlist.h +++ b/mimelib/mimelib/mboxlist.h @@ -42,7 +42,7 @@ //+ Description //. {\tt DwMailboxList} represents a list of {\it mailboxes} as described //. in RFC-822. In MIME++, {\tt DwMailboxList} is a container for objects -//. of type {\tt DwMailbox}, and it contains various member functions to +//. of type {\tt DwMailbox}, and it tqcontains various member functions to //. manage its contained objects. {\tt DwAddressList} is also a //. {\tt DwFieldBody}. This reflects the fact that certain RFC-822 header //. fields, such as the "From" header field, have a list of mailboxes as diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h index f57b9aa3..7fa16414 100644 --- a/mimelib/mimelib/mediatyp.h +++ b/mimelib/mimelib/mediatyp.h @@ -50,7 +50,7 @@ class DwParameter; //. //. {\tt DwMediaType} has member functions that allow you to set or get //. the type and subtype as either enumerated values or as strings. It -//. also contains a list of {\tt DwParameter} objects that represent the +//. also tqcontains a list of {\tt DwParameter} objects that represent the //. parameters of the field body. You can use convenience functions to //. directly access the boundary parameter of a multipart media type, or //. to access the name parameter that is often used with several media diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h index 5dbd7cc4..17ada56a 100644 --- a/mimelib/mimelib/message.h +++ b/mimelib/mimelib/message.h @@ -36,16 +36,16 @@ //+ Description //. {\tt DwMessage} represents an RFC-822/MIME {\it message}. //. -//. A {\it message} contains both a collection of {\it header fields} and +//. A {\it message} tqcontains both a collection of {\it header fields} and //. a {\it body}. In the terminology of RFC-2045, the general term for the //. headers-body combination is {\it entity}. In MIME++, {\tt DwMessage} -//. is a direct subclass of {\tt DwEntity}, and therefore contains both +//. is a direct subclass of {\tt DwEntity}, and therefore tqcontains both //. a {\tt DwHeaders} object and a {\tt DwBody} object. //. //. In the tree (broken-down) representation of message, a {\tt DwMessage} //. object is almost always a root node, having child nodes but no parent node. //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object -//. it contains. A {\tt DwMessage} may sometimes be an intermediate node. In +//. it tqcontains. A {\tt DwMessage} may sometimes be an intermediate node. In //. this special case, the parent node is a {\tt DwBody} object of type //. "message/*" and the {\tt DwMessage} object represents an encapsulated //. message. diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index c9e6707e..cc2cefb2 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -98,7 +98,7 @@ //. A collection of headers is part of a message or body part, a header //. field is part of a collection of headers, a field-body is part //. of a header field, and so on. The parent of -//. a component is the component that contains it. This tree structure +//. a component is the component that tqcontains it. This tree structure //. is important, since a component's parent must be parsed before the //. component can be. Also, a component's string representation must //. be assembled before its parent's. To maintain consistency in the @@ -269,7 +269,7 @@ protected: // Is-modified flag DwMessageComponent* mParent; - // Component that contains this component + // Component that tqcontains this component componentType mClassId; // Class identifier for runtime type identification diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h index de066cdb..7e891bbf 100644 --- a/mimelib/mimelib/msgid.h +++ b/mimelib/mimelib/msgid.h @@ -36,7 +36,7 @@ //+ Description //. {\tt DwMsgId} represents a {\it msg-id} as described in RFC-822. In //. the BNF grammar in RFC-822, a msg-id has a {\it local-part} and a -//. {\it domain}. In MIME++, a {\tt DwMsgId} contains strings that +//. {\it domain}. In MIME++, a {\tt DwMsgId} tqcontains strings that //. contain the local-part and the domain. //. //. In the tree (broken-down) representation of message, a {\tt DwMsgId} diff --git a/mimelib/mimelib/nntp.h b/mimelib/mimelib/nntp.h index a2c17b78..bd617903 100644 --- a/mimelib/mimelib/nntp.h +++ b/mimelib/mimelib/nntp.h @@ -368,7 +368,7 @@ private: DwObserver* mObserver; virtual int PGetLine(char** aPtr, int* aLen); - virtual void PGetStatusResponse(); + virtual void PGeStatusResponse(); virtual void PGetTextResponse(); }; diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h index 35be8e0b..83242c6a 100644 --- a/mimelib/mimelib/string.h +++ b/mimelib/mimelib/string.h @@ -88,7 +88,7 @@ public: //. other string classes. {\tt DwString} also handles binary data, which can //. contain embedded NUL characters. //============================================================================= -//+ Noentry _copy _replace Length AsCharBuf Substring Prefix Suffix Prepend +//+ Noentry _copy _tqreplace Length AsCharBuf Substring Prefix Suffix Prepend //+ Noentry Append Insert Replace Delete mRep mStart mLength sEmptyString //+ Noentry ~DwString @@ -285,13 +285,13 @@ public: //. available. //. Returns {\tt *this}. - DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr); - DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr, + DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr); + DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr, size_t aPos2, size_t aLen2); - DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, + DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2); - DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr); - DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar); + DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr); + DwString& tqreplace(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}. @@ -453,7 +453,7 @@ public: //. string {\tt aCstr}. DwString substr(size_t aPos=0, size_t aLen=npos) const; - //. Returns a string that contains at most {\tt aLen} characters from + //. Returns a string that tqcontains at most {\tt aLen} characters from //. the {\tt DwString} object beginning at position {\tt aPos}. The //. returned substring will not contain more characters than what are //. available in the superstring {\tt DwString} object. @@ -557,8 +557,8 @@ protected: size_t mLength; void _copy(); - 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); + 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); private: static const size_t kEmptyBufferSize; diff --git a/mimelib/multipar.cpp b/mimelib/multipar.cpp index 07514fcf..75825a84 100644 --- a/mimelib/multipar.cpp +++ b/mimelib/multipar.cpp @@ -305,7 +305,7 @@ void MultipartMessage::SetBodyPart(int aIdx, const MultipartBodyPart& aPart) DwBody& body = mMessage->Body(); int numParts = NumberOfParts(); DwBodyPart* part = 0; - // If indexed part exists already, just replace its values + // If indexed part exists already, just tqreplace its values if (0 <= aIdx && aIdx < numParts) { part = body.FirstBodyPart(); for (int curIdx=0; curIdx < aIdx; ++curIdx) { diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp index 56fb5cc9..a89293ae 100644 --- a/mimelib/nntp.cpp +++ b/mimelib/nntp.cpp @@ -72,7 +72,7 @@ int DwNntpClient::Open(const char* aServer, DwUint16 aPort) mStatusResponse = mTextResponse = ""; int err = DwProtocolClient::Open(aServer, aPort); if (! err) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -119,7 +119,7 @@ int DwNntpClient::Article(int aArticleNum) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -144,7 +144,7 @@ int DwNntpClient::Article(const char* aMsgId) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -168,7 +168,7 @@ int DwNntpClient::Head(int aArticleNum) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -192,7 +192,7 @@ int DwNntpClient::Head(const char* aMsgId) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -216,7 +216,7 @@ int DwNntpClient::Body(int articleNum) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -240,7 +240,7 @@ int DwNntpClient::Body(const char* aMsgId) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -264,7 +264,7 @@ int DwNntpClient::Stat(int articleNum) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -285,7 +285,7 @@ int DwNntpClient::Stat(const char* aMsgId) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -306,7 +306,7 @@ int DwNntpClient::Group(const char* aNewsgroupName) int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -322,7 +322,7 @@ int DwNntpClient::Help() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 1) { PGetTextResponse(); } @@ -341,7 +341,7 @@ int DwNntpClient::Last() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -357,7 +357,7 @@ int DwNntpClient::List() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -388,7 +388,7 @@ int DwNntpClient::Newgroups(const char* aDate, const char* aTime, int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -421,7 +421,7 @@ int DwNntpClient::Newnews(const char* aNewsgroups, const char* aDate, int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); if (mReplyCode/100%10 == 2) { PGetTextResponse(); } @@ -440,7 +440,7 @@ int DwNntpClient::Next() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -456,7 +456,7 @@ int DwNntpClient::Post() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -472,7 +472,7 @@ int DwNntpClient::Quit() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -488,7 +488,7 @@ int DwNntpClient::Slave() int bufferLen = strlen(mSendBuffer); int numSent = PSend(mSendBuffer, bufferLen); if (numSent == bufferLen) { - PGetStatusResponse(); + PGeStatusResponse(); } return mReplyCode; } @@ -592,12 +592,12 @@ int DwNntpClient::SendData(const char* aBuf, int aBufLen) // Get the server's response - PGetStatusResponse(); + PGeStatusResponse(); return mReplyCode; } -void DwNntpClient::PGetStatusResponse() +void DwNntpClient::PGeStatusResponse() { mReplyCode = 0; mStatusResponse = ""; -- cgit v1.2.3