author | alwin <alwin> | 2004-03-12 19:24:38 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-12 19:24:38 (UTC) |
commit | b600871ce93553a116a66fd80acd6dfc1cc46829 (patch) (unidiff) | |
tree | b361346a49e09d9f0220993583bf183cf29bd974 /noncore/net/mail/libmailwrapper/abstractmail.cpp | |
parent | 874d5a34eca296263dcd1adf857aebe9981825a1 (diff) | |
download | opie-b600871ce93553a116a66fd80acd6dfc1cc46829.zip opie-b600871ce93553a116a66fd80acd6dfc1cc46829.tar.gz opie-b600871ce93553a116a66fd80acd6dfc1cc46829.tar.bz2 |
some more smart-pointers
some bugfixes
some renaming of internals
Diffstat (limited to 'noncore/net/mail/libmailwrapper/abstractmail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 7e6d383..68a7a4d 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -72,25 +72,25 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
72 | &result_text,&target_length); | 72 | &result_text,&target_length); |
73 | 73 | ||
74 | encodedString* result = new encodedString(); | 74 | encodedString* result = new encodedString(); |
75 | if (err == MAILIMF_NO_ERROR) { | 75 | if (err == MAILIMF_NO_ERROR) { |
76 | result->setContent(result_text,target_length); | 76 | result->setContent(result_text,target_length); |
77 | } | 77 | } |
78 | qDebug("Decode string finished"); | 78 | qDebug("Decode string finished"); |
79 | return result; | 79 | return result; |
80 | } | 80 | } |
81 | 81 | ||
82 | QString AbstractMail::convert_String(const char*text) | 82 | QString AbstractMail::convert_String(const char*text) |
83 | { | 83 | { |
84 | size_t index = 0; | 84 | //size_t index = 0; |
85 | char*res = 0; | 85 | char*res = 0; |
86 | int err = MAILIMF_NO_ERROR; | 86 | int err = MAILIMF_NO_ERROR; |
87 | 87 | ||
88 | QString result(text); | 88 | QString result(text); |
89 | 89 | ||
90 | /* due a bug in libetpan it isn't usable this moment */ | 90 | /* due a bug in libetpan it isn't usable this moment */ |
91 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 91 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", |
92 | text, strlen(text),&index, "iso-8859-1",&res);*/ | 92 | text, strlen(text),&index, "iso-8859-1",&res);*/ |
93 | //qDebug("Input: %s",text); | 93 | //qDebug("Input: %s",text); |
94 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 94 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
95 | // result = QString(res); | 95 | // result = QString(res); |
96 | // qDebug("Res: %s, length: %i",res,strlen(res)); | 96 | // qDebug("Res: %s, length: %i",res,strlen(res)); |
@@ -102,66 +102,66 @@ QString AbstractMail::convert_String(const char*text) | |||
102 | /* cp & paste from launcher */ | 102 | /* cp & paste from launcher */ |
103 | QString AbstractMail::gen_attachment_id() | 103 | QString AbstractMail::gen_attachment_id() |
104 | { | 104 | { |
105 | QFile file( "/proc/sys/kernel/random/uuid" ); | 105 | QFile file( "/proc/sys/kernel/random/uuid" ); |
106 | if (!file.open(IO_ReadOnly ) ) | 106 | if (!file.open(IO_ReadOnly ) ) |
107 | return QString::null; | 107 | return QString::null; |
108 | 108 | ||
109 | QTextStream stream(&file); | 109 | QTextStream stream(&file); |
110 | 110 | ||
111 | return "{" + stream.read().stripWhiteSpace() + "}"; | 111 | return "{" + stream.read().stripWhiteSpace() + "}"; |
112 | } | 112 | } |
113 | 113 | ||
114 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& delemiter,bool) | 114 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) |
115 | { | 115 | { |
116 | return 0; | 116 | return 0; |
117 | } | 117 | } |
118 | 118 | ||
119 | QString AbstractMail::defaultLocalfolder() | 119 | QString AbstractMail::defaultLocalfolder() |
120 | { | 120 | { |
121 | QString f = getenv( "HOME" ); | 121 | QString f = getenv( "HOME" ); |
122 | f += "/Applications/opiemail/localmail"; | 122 | f += "/Applications/opiemail/localmail"; |
123 | return f; | 123 | return f; |
124 | } | 124 | } |
125 | 125 | ||
126 | QString AbstractMail::draftFolder() | 126 | QString AbstractMail::draftFolder() |
127 | { | 127 | { |
128 | return QString("Drafts"); | 128 | return QString("Drafts"); |
129 | } | 129 | } |
130 | 130 | ||
131 | /* temporary - will be removed when implemented in all classes */ | 131 | /* temporary - will be removed when implemented in all classes */ |
132 | void AbstractMail::deleteMails(const QString &,QList<RecMail> &) | 132 | void AbstractMail::deleteMails(const QString &,const QValueList<Opie::OSmartPointer<RecMail> > &) |
133 | { | 133 | { |
134 | } | 134 | } |
135 | 135 | ||
136 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, | 136 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, |
137 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 137 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
138 | { | 138 | { |
139 | QList<RecMail> t; | 139 | QValueList<RecMailP> t; |
140 | listMessages(fromFolder->getName(),t); | 140 | listMessages(fromFolder->getName(),t); |
141 | encodedString*st = 0; | 141 | encodedString*st = 0; |
142 | while (t.count()>0) { | 142 | while (t.count()>0) { |
143 | RecMail*r = t.at(0); | 143 | RecMailP r = (*t.begin()); |
144 | st = fetchRawBody(*r); | 144 | st = fetchRawBody(r); |
145 | if (st) { | 145 | if (st) { |
146 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); | 146 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); |
147 | delete st; | 147 | delete st; |
148 | } | 148 | } |
149 | t.removeFirst(); | 149 | t.remove(t.begin()); |
150 | } | 150 | } |
151 | if (moveit) { | 151 | if (moveit) { |
152 | deleteAllMail(fromFolder); | 152 | deleteAllMail(fromFolder); |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | void AbstractMail::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 156 | void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
157 | { | 157 | { |
158 | encodedString*st = 0; | 158 | encodedString*st = 0; |
159 | st = fetchRawBody(mail); | 159 | st = fetchRawBody(mail); |
160 | if (st) { | 160 | if (st) { |
161 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); | 161 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); |
162 | delete st; | 162 | delete st; |
163 | } | 163 | } |
164 | if (moveit) { | 164 | if (moveit) { |
165 | deleteMail(mail); | 165 | deleteMail(mail); |
166 | } | 166 | } |
167 | } | 167 | } |