author | mickeyl <mickeyl> | 2005-07-03 21:03:44 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-03 21:03:44 (UTC) |
commit | 62842736cf871376f947f7b27ebc6f58fbc84fdc (patch) (unidiff) | |
tree | c37cb61624a0d6654eeeb218f93c5766bb9ff6f6 /noncore/net/mail/mainwindow.cpp | |
parent | df3947675e6e2fd46704810414005aa56aa391a1 (diff) | |
download | opie-62842736cf871376f947f7b27ebc6f58fbc84fdc.zip opie-62842736cf871376f947f7b27ebc6f58fbc84fdc.tar.gz opie-62842736cf871376f947f7b27ebc6f58fbc84fdc.tar.bz2 |
Resource -> OResource
Dan, please check if I did everything correctly
Diffstat (limited to 'noncore/net/mail/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
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,21 +1,22 @@ | |||
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 | |||
14 | using namespace Opie::Core; | 9 | using 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 | |||
16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 18 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
17 | : QMainWindow( parent, name, flags ) | 19 | : QMainWindow( parent, name, flags ) |
18 | { | 20 | { |
19 | |||
20 | setCaption( tr( "Mail" ) ); | 21 | setCaption( tr( "Mail" ) ); |
21 | setToolBarsMovable( false ); | 22 | setToolBarsMovable( false ); |
@@ -96,5 +97,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
96 | 97 | ||
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 ); |
100 | searchMails->addTo( toolBar ); | 101 | searchMails->addTo( toolBar ); |
@@ -102,5 +103,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
102 | */ | 103 | */ |
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 ); |
106 | deleteMails->addTo( mailMenu ); | 107 | deleteMails->addTo( mailMenu ); |
@@ -108,10 +109,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
108 | SLOT( slotDeleteMail() ) ); | 109 | SLOT( slotDeleteMail() ) ); |
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 ); |
112 | editSettings->addTo( settingsMenu ); | 113 | editSettings->addTo( settingsMenu ); |
113 | connect( editSettings, SIGNAL( activated() ), | 114 | connect( editSettings, SIGNAL( activated() ), |
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 ); |
117 | editAccounts->addTo( settingsMenu ); | 118 | editAccounts->addTo( settingsMenu ); |