Diffstat (limited to 'noncore/net/mail/composemail.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/composemail.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 154c1d5..9d04de3 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -1,34 +1,33 @@ | |||
1 | 1 | ||
2 | #include "composemail.h" | 2 | #include "composemail.h" |
3 | 3 | ||
4 | #include <libmailwrapper/smtpwrapper.h> | 4 | #include <libmailwrapper/smtpwrapper.h> |
5 | #include <libmailwrapper/storemail.h> | 5 | #include <libmailwrapper/storemail.h> |
6 | #include <libmailwrapper/abstractmail.h> | 6 | #include <libmailwrapper/abstractmail.h> |
7 | #include <libmailwrapper/mailtypes.h> | 7 | #include <libmailwrapper/mailtypes.h> |
8 | 8 | ||
9 | /* OPIE */ | 9 | /* OPIE */ |
10 | #include <opie2/ofiledialog.h> | 10 | #include <opie2/ofiledialog.h> |
11 | #include <opie2/odebug.h> | 11 | #include <opie2/odebug.h> |
12 | #include <qpe/resource.h> | 12 | #include <opie2/oresource.h> |
13 | #include <qpe/config.h> | 13 | #include <qpe/config.h> |
14 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
15 | #include <qpe/contact.h> | 15 | #include <qpe/contact.h> |
16 | using namespace Opie::Core; | ||
17 | using namespace Opie::Ui; | ||
16 | 18 | ||
17 | /* QT */ | 19 | /* QT */ |
18 | #include <qt.h> | 20 | #include <qt.h> |
19 | 21 | ||
20 | |||
21 | using namespace Opie::Core; | ||
22 | using namespace Opie::Ui; | ||
23 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 22 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
24 | : ComposeMailUI( parent, name, modal, flags ) | 23 | : ComposeMailUI( parent, name, modal, flags ) |
25 | { | 24 | { |
26 | settings = s; | 25 | settings = s; |
27 | m_replyid = ""; | 26 | m_replyid = ""; |
28 | 27 | ||
29 | QString vfilename = Global::applicationFileName("addressbook", | 28 | QString vfilename = Global::applicationFileName("addressbook", |
30 | "businesscard.vcf"); | 29 | "businesscard.vcf"); |
31 | Contact c; | 30 | Contact c; |
32 | if (QFile::exists(vfilename)) { | 31 | if (QFile::exists(vfilename)) { |
33 | c = Contact::readVCard( vfilename )[0]; | 32 | c = Contact::readVCard( vfilename )[0]; |
34 | } | 33 | } |
@@ -290,18 +289,18 @@ void ComposeMail::reEditMail(const RecMailP¤t) | |||
290 | toLine->setText(data->To().join(",")); | 289 | toLine->setText(data->To().join(",")); |
291 | ccLine->setText(data->CC().join(",")); | 290 | ccLine->setText(data->CC().join(",")); |
292 | bccLine->setText(data->Bcc().join(",")); | 291 | bccLine->setText(data->Bcc().join(",")); |
293 | replyLine->setText(data->Replyto()); | 292 | replyLine->setText(data->Replyto()); |
294 | } | 293 | } |
295 | 294 | ||
296 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 295 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |
297 | : QListViewItem( parent ) | 296 | : QListViewItem( parent ) |
298 | { | 297 | { |
299 | attachment = att; | 298 | attachment = att; |
300 | odebug << att->getMimeType() << oendl; | 299 | odebug << att->getMimeType() << oendl; |
301 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 300 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
302 | Resource::loadPixmap( "UnknownDocument-14" ) : | 301 | OResource::loadPixmap( "UnknownDocument", OResource::SmallIcon ) : |
303 | attachment->getDocLnk().pixmap() ); | 302 | attachment->getDocLnk().pixmap() ); |
304 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); | 303 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); |
305 | setText( 1, QString::number( att->getSize() ) ); | 304 | setText( 1, QString::number( att->getSize() ) ); |
306 | } | 305 | } |
307 | 306 | ||