summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp6
-rw-r--r--noncore/unsupported/mail2/composerbase.h4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
6 files changed, 13 insertions, 13 deletions
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 7754863..10d567d 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -1,14 +1,14 @@
#include <qmultilineedit.h>
#include <qpopupmenu.h>
#include <qcombobox.h>
#include <qlineedit.h>
-#include <qtoolbar.h>
#include <qlayout.h>
#include <qaction.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "listviewplus.h"
#include "composerbase.h"
@@ -18,9 +18,9 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
{
setCaption(tr("Compose Message"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
addToolBar(toolbar);
toolbar->setHorizontalStretchable(true);
sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
@@ -115,9 +115,9 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
attachWindow->setMaximumHeight(100);
attachWindow->setToolBarsMovable(false);
attachWindow->hide();
- attachToolbar = new QToolBar(attachWindow);
+ attachToolbar = new QPEToolBar(attachWindow);
attachToolbar->setVerticalStretchable(true);
addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
addattach->addTo(attachToolbar);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index e5fab67..75b77f4 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -5,11 +5,11 @@
class QMultiLineEdit;
class ListViewPlus;
class QPopupMenu;
+class QPEToolBar;
class QComboBox;
class QLineEdit;
-class QToolBar;
class QAction;
class QLabel;
class ComposerBase : public QMainWindow
@@ -37,11 +37,11 @@ protected:
QMultiLineEdit *message;
ListViewPlus *attachView;
QMainWindow *attachWindow;
QPopupMenu *attachPopup;
+ QPEToolBar *toolbar, *attachToolbar;
QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority;
QLineEdit *replyto, *to, *cc, *bcc, *subject;
- QToolBar *toolbar, *attachToolbar;
QAction *sendmail, *attachfile, *addressbook, *abort, *addattach, *delattach;
QLabel *fromLabel, *status;
protected slots:
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 4054af6..c55bd90 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,13 +1,13 @@
#include <qprogressbar.h>
#include <qtoolbutton.h>
#include <qpopupmenu.h>
-#include <qtoolbar.h>
#include <qaction.h>
#include <qheader.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "mainwindowbase.h"
#include "folderwidget.h"
@@ -18,9 +18,9 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
{
setCaption(tr("E-Mail"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
addToolBar(toolbar);
toolbar->setHorizontalStretchable(true);
compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index cf23f4f..0776f02 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -5,10 +5,10 @@
class ServerConnection;
class QProgressBar;
class FolderWidget;
+class QPEToolBar;
class MailTable;
-class QToolBar;
class QAction;
class QLabel;
class MainWindowBase : public QMainWindow
@@ -24,10 +24,10 @@ protected slots:
protected:
ServerConnection *serverConnection;
QProgressBar *statusProgress;
FolderWidget *folderView;
+ QPEToolBar *toolbar;
MailTable *mailView;
- QToolBar *toolbar;
QAction *compose, *folders, *findmails, *configure, *stop;
QLabel *statusLabel;
};
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index 134e5cb..b650c88 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -1,11 +1,11 @@
#include <qtextbrowser.h>
#include <qlistview.h>
-#include <qtoolbar.h>
#include <qaction.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "viewmailbase.h"
#include "opendiag.h"
@@ -15,9 +15,9 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
{
setCaption(tr("E-Mail by %1"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
toolbar->setHorizontalStretchable(true);
addToolBar(toolbar);
reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 183bb04..9ddf2aa 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -4,10 +4,10 @@
#include <qmainwindow.h>
class QAction;
class OpenDiag;
-class QToolBar;
class QListView;
+class QPEToolBar;
class QTextBrowser;
class ViewMailBase : public QMainWindow
{
@@ -18,9 +18,9 @@ public:
protected:
QAction *reply, *forward, *attachbutton, *deleteMail;
QListView *attachments;
- QToolBar *toolbar;
+ QPEToolBar *toolbar;
QTextBrowser *browser;
OpenDiag *openDiag;
protected slots: