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
@@ -2,12 +2,12 @@
 #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"
@@ -19,7 +19,7 @@ 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);
 
@@ -116,7 +116,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	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);
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
@@ -6,9 +6,9 @@
 class QMultiLineEdit;
 class ListViewPlus;
 class QPopupMenu;
+class QPEToolBar;
 class QComboBox;
 class QLineEdit;
-class QToolBar;
 class QAction;
 class QLabel;
 
@@ -38,9 +38,9 @@ protected:
 	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;
 
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,12 +1,12 @@
 #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"
@@ -19,7 +19,7 @@ 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);
 
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
@@ -6,8 +6,8 @@
 class ServerConnection;
 class QProgressBar;
 class FolderWidget;
+class QPEToolBar;
 class MailTable;
-class QToolBar;
 class QAction;
 class QLabel;
 
@@ -25,8 +25,8 @@ 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,10 +1,10 @@
 #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"
@@ -16,7 +16,7 @@ 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);
 
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
@@ -5,8 +5,8 @@
 
 class QAction;
 class OpenDiag;
-class QToolBar;
 class QListView;
+class QPEToolBar;
 class QTextBrowser;
 
 class ViewMailBase : public QMainWindow
@@ -19,7 +19,7 @@ public:
 protected:
 	QAction *reply, *forward, *attachbutton, *deleteMail;
 	QListView *attachments;
-	QToolBar *toolbar;
+	QPEToolBar *toolbar;
 	QTextBrowser *browser;
 	OpenDiag *openDiag;