summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountitem.cpp6
-rw-r--r--noncore/net/mail/addresspicker.cpp6
-rw-r--r--noncore/net/mail/composemail.cpp9
-rw-r--r--noncore/net/mail/config.in6
-rw-r--r--noncore/net/mail/defines.h33
-rw-r--r--noncore/net/mail/mailistviewitem.cpp14
-rw-r--r--noncore/net/mail/mainwindow.cpp29
-rw-r--r--noncore/net/mail/opiemail.cpp7
-rw-r--r--noncore/net/mail/viewmailbase.cpp24
9 files changed, 71 insertions, 63 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index f7fdccd..f3f2182 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -10,5 +10,8 @@
10#include <libmailwrapper/mailwrapper.h> 10#include <libmailwrapper/mailwrapper.h>
11
11/* OPIE */ 12/* OPIE */
12#include <opie2/odebug.h> 13#include <opie2/odebug.h>
14#include <opie2/oresource.h>
13#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
16using namespace Opie::Core;
14 17
@@ -18,3 +21,2 @@
18 21
19using namespace Opie::Core;
20#define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} 22#define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
@@ -900,3 +902,3 @@ void MHfolderItem::initName()
900 } else if (bName.lower() == "drafts") { 902 } else if (bName.lower() == "drafts") {
901 setPixmap(0, Resource::loadPixmap("edit")); 903 setPixmap(0, Opie::Core::OResource::loadPixmap("edit", Opie::Core::OResource::SmallIcon));
902 } else { 904 } else {
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index 50c82e5..4e328d4 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -6,3 +6,3 @@
6#include <opie2/opimcontact.h> 6#include <opie2/opimcontact.h>
7#include <qpe/resource.h> 7#include <opie2/oresource.h>
8#include <qpe/qpeapplication.h> 8#include <qpe/qpeapplication.h>
@@ -20,4 +20,4 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
20{ 20{
21 okButton->setIconSet( Resource::loadPixmap( "enter" ) ); 21 okButton->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) );
22 cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) ); 22 cancelButton->setIconSet( Opie::Core::OResource::loadPixmap( "editdelete", Opie::Core::OResource::SmallIcon ) );
23 23
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
@@ -11,3 +11,3 @@
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>
@@ -15,2 +15,4 @@
15#include <qpe/contact.h> 15#include <qpe/contact.h>
16using namespace Opie::Core;
17using namespace Opie::Ui;
16 18
@@ -19,5 +21,2 @@
19 21
20
21using namespace Opie::Core;
22using namespace Opie::Ui;
23ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) 22ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
@@ -301,3 +300,3 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
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() );
diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in
index f7fce91..b18feb7 100644
--- a/noncore/net/mail/config.in
+++ b/noncore/net/mail/config.in
@@ -5,5 +5,5 @@ config MAIL3
5 default "y" 5 default "y"
6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER
7 comment "opie-mail3 needs a libqpe, libopie2core, libopie2pim and the libmailwrapper" 7 comment "opie-mail3 needs a libqpe, libopie2core, libopie2ui, libopie2pim and the libmailwrapper"
8 depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER ) 8 depends ! ( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2MM && LIBMAILWRAPPER )
9 9
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index 50d63dd..36ac5a1 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -3,3 +3,4 @@
3 3
4#include <qpe/resource.h> 4#include <opie2/oresource.h>
5using namespace Opie::Core;
5 6
@@ -21,18 +22,18 @@
21 22
22#define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) 23#define ICON_COMPOSEMAIL QIconSet( OResource::loadPixmap( PIC_COMPOSEMAIL, OResource::SmallIcon ) )
23#define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) 24#define ICON_SENDQUEUED QIconSet( OResource::loadPixmap( PIC_SENDQUEUED, OResource::SmallIcon ) )
24#define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) 25#define ICON_SHOWFOLDERS QIconSet( OResource::loadPixmap( PIC_SHOWFOLDERS, OResource::SmallIcon ) )
25#define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) 26#define ICON_SEARCHMAILS QIconSet( OResource::loadPixmap( PIC_SEARCHMAILS, OResource::SmallIcon ) )
26#define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) 27#define ICON_EDITSETTINGS QIconSet( OResource::loadPixmap( PIC_EDITSETTINGS, OResource::SmallIcon ) )
27#define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) 28#define ICON_EDITACCOUNTS QIconSet( OResource::loadPixmap( PIC_EDITACCOUNTS, OResource::SmallIcon ) )
28#define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) 29#define ICON_SYNC QIconSet( OResource::loadPixmap( PIC_SYNC, OResource::SmallIcon ) )
29#define ICON_READMAIL QIconSet( Resource::loadPixmap( PIC_DOCUMENT)) 30#define ICON_READMAIL QIconSet( OResource::loadPixmap( PIC_DOCUMENT, OResource::SmallIcon) )
30 31
31#define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) ) 32#define PIXMAP_IMAPFOLDER QPixmap( OResource::loadPixmap( PIC_IMAPFOLDER, OResource::SmallIcon ) )
32#define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) ) 33#define PIXMAP_POP3FOLDER QPixmap( OResource::loadPixmap( PIC_POP3FOLDER, OResource::SmallIcon ) )
33#define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) ) 34#define PIXMAP_INBOXFOLDER QPixmap( OResource::loadPixmap( PIC_INBOXFOLDER, OResource::SmallIcon ) )
34#define PIXMAP_MBOXFOLDER QPixmap( Resource::loadPixmap( PIC_MBOXFOLDER ) ) 35#define PIXMAP_MBOXFOLDER QPixmap( OResource::loadPixmap( PIC_MBOXFOLDER, OResource::SmallIcon ) )
35#define PIXMAP_OUTBOXFOLDER QPixmap( Resource::loadPixmap( PIC_OUTBOXFOLDER) ) 36#define PIXMAP_OUTBOXFOLDER QPixmap( OResource::loadPixmap( PIC_OUTBOXFOLDER, OResource::SmallIcon ) )
36#define PIXMAP_LOCALFOLDER QPixmap( Resource::loadPixmap( PIC_LOCALFOLDER) ) 37#define PIXMAP_LOCALFOLDER QPixmap( OResource::loadPixmap( PIC_LOCALFOLDER, OResource::SmallIcon ) )
37#define PIXMAP_OFFLINE QPixmap( Resource::loadPixmap( PIC_OFFLINE) ) 38#define PIXMAP_OFFLINE QPixmap( OResource::loadPixmap( PIC_OFFLINE, OResource::SmallIcon ) )
38 39
diff --git a/noncore/net/mail/mailistviewitem.cpp b/noncore/net/mail/mailistviewitem.cpp
index d3a0723..5254616 100644
--- a/noncore/net/mail/mailistviewitem.cpp
+++ b/noncore/net/mail/mailistviewitem.cpp
@@ -2,6 +2,10 @@
2#include <libmailwrapper/abstractmail.h> 2#include <libmailwrapper/abstractmail.h>
3#include <qtextstream.h> 3
4#include <qpe/resource.h> 4/* OPIE */
5#include <opie2/oresource.h>
5#include <qpe/timestring.h> 6#include <qpe/timestring.h>
6 7
8/* QT */
9#include <qtextstream.h>
10
7MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) 11MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
@@ -14,3 +18,3 @@ void MailListViewItem::showEntry()
14 if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) { 18 if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
15 setPixmap( 0, Resource::loadPixmap( "mail/kmmsgreplied") ); 19 setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgreplied", Opie::Core::OResource::SmallIcon ) );
16 } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) { 20 } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) {
@@ -18,5 +22,5 @@ void MailListViewItem::showEntry()
18 replied or new - Alwin*/ 22 replied or new - Alwin*/
19 //setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") ); 23 //setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgunseen", Opie::Core::OResource::SmallIcon ) );
20 } else { 24 } else {
21 setPixmap( 0, Resource::loadPixmap( "mail/kmmsgnew") ); 25 setPixmap( 0, Opie::Core::OResource::loadPixmap( "mail/kmmsgnew", Opie::Core::OResource::SmallIcon ) );
22 } 26 }
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index b587424..bce4c0d 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,16 +1,18 @@
1#include <qlabel.h> 1#include "defines.h"
2#include <qvbox.h> 2#include "mainwindow.h"
3#include <qheader.h>
4#include <qtimer.h>
5#include <qlayout.h>
6 3
4/* OPIE */
7#include <opie2/odebug.h> 5#include <opie2/odebug.h>
6#include <opie2/oresource.h>
8#include <qpe/qpeapplication.h> 7#include <qpe/qpeapplication.h>
9#include <qpe/qcopenvelope_qws.h> 8#include <qpe/qcopenvelope_qws.h>
10
11#include "defines.h"
12#include "mainwindow.h"
13
14using namespace Opie::Core; 9using namespace Opie::Core;
15 10
11/* QT */
12#include <qlabel.h>
13#include <qvbox.h>
14#include <qheader.h>
15#include <qtimer.h>
16#include <qlayout.h>
17
16MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 18MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
@@ -18,3 +20,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
18{ 20{
19
20 setCaption( tr( "Mail" ) ); 21 setCaption( tr( "Mail" ) );
@@ -97,3 +98,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
97 /* 98 /*
98 searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ), 99 searchMails = new QAction( tr( "Search mails" ), OResource::loadPixmap("find", OResource::SmallIcon ),
99 0, 0, this ); 100 0, 0, this );
@@ -103,3 +104,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
103 104
104 deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this); 105 deleteMails = new QAction(tr("Delete Mail"), OResource::loadPixmap("trash", OResource::SmallIcon ), 0, 0, this);
105 deleteMails->addTo( toolBar ); 106 deleteMails->addTo( toolBar );
@@ -109,3 +110,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
109 110
110 editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) , 111 editSettings = new QAction( tr( "Edit settings" ), OResource::loadPixmap("SettingsIcon", OResource::SmallIcon ) ,
111 0, 0, this ); 112 0, 0, this );
@@ -114,3 +115,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
114 SLOT( slotEditSettings() ) ); 115 SLOT( slotEditSettings() ) );
115 editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , 116 editAccounts = new QAction( tr( "Configure accounts" ), OResource::loadPixmap("mail/editaccounts", OResource::SmallIcon ) ,
116 0, 0, this ); 117 0, 0, this );
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index fb8877a..e07ed6f 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -13,7 +13,8 @@
13#include <libmailwrapper/abstractmail.h> 13#include <libmailwrapper/abstractmail.h>
14
14/* OPIE */ 15/* OPIE */
15#include <opie2/odebug.h> 16#include <opie2/odebug.h>
16#include <qpe/resource.h>
17#include <qpe/qpeapplication.h> 17#include <qpe/qpeapplication.h>
18#include <qpe/config.h> 18#include <qpe/config.h>
19using namespace Opie::Core;
19 20
@@ -26,4 +27,2 @@
26 27
27using namespace Opie::Core;
28
29typedef QMapNode<QString,QString> tkeyvalues; 28typedef QMapNode<QString,QString> tkeyvalues;
@@ -280,3 +279,3 @@ void OpieMail::displayMail()
280 { 279 {
281 ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) ); 280 ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
282 } 281 }
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 65ad0d6..9e17439 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -1 +1,8 @@
1#include "viewmailbase.h"
2
3/* OPIE */
4#include <opie2/oresource.h>
5using namespace Opie::Core;
6
7/* QT */
1#include <qtextbrowser.h> 8#include <qtextbrowser.h>
@@ -5,3 +12,2 @@
5#include <qvbox.h> 12#include <qvbox.h>
6
7#include <qtoolbar.h> 13#include <qtoolbar.h>
@@ -9,6 +15,2 @@
9#include <qmenubar.h> 15#include <qmenubar.h>
10#include <qpe/resource.h>
11
12#include "viewmailbase.h"
13//#include "opendiag.h"
14 16
@@ -30,3 +32,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
30 32
31 reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); 33 reply = new QAction(tr("Reply"), OResource::loadPixmap("mail/reply", OResource::SmallIcon), 0, 0, this);
32 reply->addTo(toolbar); 34 reply->addTo(toolbar);
@@ -34,3 +36,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
34 36
35 forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); 37 forward = new QAction(tr("Forward"), OResource::loadPixmap("mail/forward", OResource::SmallIcon), 0, 0, this);
36 forward->addTo(toolbar); 38 forward->addTo(toolbar);
@@ -38,3 +40,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
38 40
39 attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); 41 attachbutton = new QAction(tr("Attachments"), OResource::loadPixmap("mail/attach", OResource::SmallIcon), 0, 0, this, 0, true);
40 attachbutton->addTo(toolbar); 42 attachbutton->addTo(toolbar);
@@ -44,3 +46,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
44 46
45 showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); 47 showHtml = new QAction( tr( "Show Html" ), OResource::loadPixmap( "mail/html", OResource::SmallIcon ), 0, 0, this, 0, true );
46 showHtml->addTo( toolbar ); 48 showHtml->addTo( toolbar );
@@ -48,3 +50,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
48 50
49 showPicsInline= new QAction(tr("Show image preview inline"), QIconSet(Resource::loadPixmap("pixmap")), 0, 0, this); 51 showPicsInline= new QAction(tr("Show image preview inline"), OResource::loadPixmap("pixmap", OResource::SmallIcon), 0, 0, this);
50 showPicsInline->setToggleAction(true); 52 showPicsInline->setToggleAction(true);
@@ -53,3 +55,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
53 55
54 deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); 56 deleteMail = new QAction(tr("Delete Mail"), OResource::loadPixmap("trash", OResource::SmallIcon), 0, 0, this);
55 deleteMail->addTo(toolbar); 57 deleteMail->addTo(toolbar);