-rw-r--r-- | kabc/vcard/EmailParam.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp index 8c87477..877af60 100644 --- a/kabc/vcard/EmailParam.cpp +++ b/kabc/vcard/EmailParam.cpp | |||
@@ -1,93 +1,95 @@ | |||
1 | /* | 1 | /* |
2 | libvcard - vCard parsing library for vCard version 3.0 | 2 | libvcard - vCard parsing library for vCard version 3.0 |
3 | 3 | ||
4 | Copyright (C) 1998 Rik Hemsley rik@kde.org | 4 | Copyright (C) 1998 Rik Hemsley rik@kde.org |
5 | 5 | ||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy |
7 | of this software and associated documentation files (the "Software"), to | 7 | of this software and associated documentation files (the "Software"), to |
8 | deal in the Software without restriction, including without limitation the | 8 | deal in the Software without restriction, including without limitation the |
9 | rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | 9 | rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
10 | sell copies of the Software, and to permit persons to whom the Software is | 10 | sell copies of the Software, and to permit persons to whom the Software is |
11 | furnished to do so, subject to the following conditions: | 11 | furnished to do so, subject to the following conditions: |
12 | 12 | ||
13 | The above copyright notice and this permission notice shall be included in | 13 | The above copyright notice and this permission notice shall be included in |
14 | all copies or substantial portions of the Software. | 14 | all copies or substantial portions of the Software. |
15 | 15 | ||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
19 | AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | 19 | AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
20 | ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 20 | ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
21 | WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <VCardEmailParam.h> | 24 | #include <VCardEmailParam.h> |
25 | #include <VCardParam.h> | 25 | #include <VCardParam.h> |
26 | #include <VCardDefines.h> | 26 | #include <VCardDefines.h> |
27 | //Added by qt3to4: | ||
28 | #include <Q3CString> | ||
27 | 29 | ||
28 | using namespace VCARD; | 30 | using namespace VCARD; |
29 | 31 | ||
30 | EmailParam::EmailParam() | 32 | EmailParam::EmailParam() |
31 | :Param() | 33 | :Param() |
32 | { | 34 | { |
33 | vDebug("ctor"); | 35 | vDebug("ctor"); |
34 | } | 36 | } |
35 | 37 | ||
36 | EmailParam::EmailParam(const EmailParam & x) | 38 | EmailParam::EmailParam(const EmailParam & x) |
37 | :Param(x), | 39 | :Param(x), |
38 | emailType_(x.emailType_), | 40 | emailType_(x.emailType_), |
39 | pref_ (x.pref_) | 41 | pref_ (x.pref_) |
40 | { | 42 | { |
41 | } | 43 | } |
42 | 44 | ||
43 | EmailParam::EmailParam(const QCString & s) | 45 | EmailParam::EmailParam(const Q3CString & s) |
44 | :Param(s) | 46 | :Param(s) |
45 | { | 47 | { |
46 | } | 48 | } |
47 | 49 | ||
48 | EmailParam & | 50 | EmailParam & |
49 | EmailParam::operator = (EmailParam & x) | 51 | EmailParam::operator = (EmailParam & x) |
50 | { | 52 | { |
51 | if (*this == x) return *this; | 53 | if (*this == x) return *this; |
52 | 54 | ||
53 | emailType_= x.emailType(); | 55 | emailType_= x.emailType(); |
54 | pref_ = x.pref_; | 56 | pref_ = x.pref_; |
55 | 57 | ||
56 | Param::operator = (x); | 58 | Param::operator = (x); |
57 | return *this; | 59 | return *this; |
58 | } | 60 | } |
59 | 61 | ||
60 | EmailParam & | 62 | EmailParam & |
61 | EmailParam::operator = (const QCString & s) | 63 | EmailParam::operator = (const Q3CString & s) |
62 | { | 64 | { |
63 | Param::operator = (s); | 65 | Param::operator = (s); |
64 | return *this; | 66 | return *this; |
65 | } | 67 | } |
66 | 68 | ||
67 | bool | 69 | bool |
68 | EmailParam::operator == (EmailParam & x) | 70 | EmailParam::operator == (EmailParam & x) |
69 | { | 71 | { |
70 | parse(); | 72 | parse(); |
71 | 73 | ||
72 | if (pref_) | 74 | if (pref_) |
73 | return (x.pref_ && x.emailType() == emailType_); | 75 | return (x.pref_ && x.emailType() == emailType_); |
74 | 76 | ||
75 | return !x.pref(); | 77 | return !x.pref(); |
76 | } | 78 | } |
77 | 79 | ||
78 | EmailParam::~EmailParam() | 80 | EmailParam::~EmailParam() |
79 | { | 81 | { |
80 | } | 82 | } |
81 | 83 | ||
82 | void | 84 | void |
83 | EmailParam::_parse() | 85 | EmailParam::_parse() |
84 | { | 86 | { |
85 | #if 0 | 87 | #if 0 |
86 | Param::parseToList(); | 88 | Param::parseToList(); |
87 | 89 | ||
88 | SubParamListIterator it(subParamList_); | 90 | SubParamListIterator it(subParamList_); |
89 | 91 | ||
90 | pref_ = true; | 92 | pref_ = true; |
91 | emailType_ = ""; | 93 | emailType_ = ""; |
92 | 94 | ||
93 | for (; it.current(); ++it) { | 95 | for (; it.current(); ++it) { |