author | mickeyl <mickeyl> | 2005-07-03 21:03:44 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-03 21:03:44 (UTC) |
commit | 62842736cf871376f947f7b27ebc6f58fbc84fdc (patch) (side-by-side diff) | |
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) (ignore 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,22 +1,23 @@ -#include <qlabel.h> -#include <qvbox.h> -#include <qheader.h> -#include <qtimer.h> -#include <qlayout.h> +#include "defines.h" +#include "mainwindow.h" +/* OPIE */ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> - -#include "defines.h" -#include "mainwindow.h" - using namespace Opie::Core; +/* QT */ +#include <qlabel.h> +#include <qvbox.h> +#include <qheader.h> +#include <qtimer.h> +#include <qlayout.h> + MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) : QMainWindow( parent, name, flags ) { - setCaption( tr( "Mail" ) ); setToolBarsMovable( false ); @@ -95,24 +96,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) SLOT( slotShowFolders(bool) ) ); /* - searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ), + searchMails = new QAction( tr( "Search mails" ), OResource::loadPixmap("find", OResource::SmallIcon ), 0, 0, this ); searchMails->addTo( toolBar ); searchMails->addTo( mailMenu ); */ - deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this); + deleteMails = new QAction(tr("Delete Mail"), OResource::loadPixmap("trash", OResource::SmallIcon ), 0, 0, this); deleteMails->addTo( toolBar ); deleteMails->addTo( mailMenu ); connect( deleteMails, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); - editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) , + editSettings = new QAction( tr( "Edit settings" ), OResource::loadPixmap("SettingsIcon", OResource::SmallIcon ) , 0, 0, this ); editSettings->addTo( settingsMenu ); connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) ); - editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , + editAccounts = new QAction( tr( "Configure accounts" ), OResource::loadPixmap("mail/editaccounts", OResource::SmallIcon ) , 0, 0, this ); editAccounts->addTo( settingsMenu ); |