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
@@ -4,3 +4,2 @@
 #include <qlineedit.h>
-#include <qtoolbar.h>
 #include <qlayout.h>
@@ -10,2 +9,3 @@
 
+#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -21,3 +21,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
-	toolbar = new QToolBar(this);
+	toolbar = new QPEToolBar(this);
 	addToolBar(toolbar);
@@ -118,3 +118,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
-	attachToolbar = new QToolBar(attachWindow);
+	attachToolbar = new QPEToolBar(attachWindow);
 	attachToolbar->setVerticalStretchable(true);
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
@@ -8,5 +8,5 @@ class ListViewPlus;
 class QPopupMenu;
+class QPEToolBar;
 class QComboBox;
 class QLineEdit;
-class QToolBar;
 class QAction;
@@ -40,5 +40,5 @@ protected:
 	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;
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
@@ -3,3 +3,2 @@
 #include <qpopupmenu.h>
-#include <qtoolbar.h>
 #include <qaction.h>
@@ -9,2 +8,3 @@
 
+#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -21,3 +21,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
-	toolbar = new QToolBar(this);
+	toolbar = new QPEToolBar(this);
 	addToolBar(toolbar);
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
@@ -8,4 +8,4 @@ class QProgressBar;
 class FolderWidget;
+class QPEToolBar;
 class MailTable;
-class QToolBar;
 class QAction;
@@ -27,4 +27,4 @@ protected:
 	FolderWidget *folderView;
+	QPEToolBar *toolbar;
 	MailTable *mailView;
-	QToolBar *toolbar;
 	QAction *compose, *folders, *findmails, *configure, *stop;
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
@@ -2,3 +2,2 @@
 #include <qlistview.h>
-#include <qtoolbar.h>
 #include <qaction.h>
@@ -7,2 +6,3 @@
 
+#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -18,3 +18,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-	toolbar = new QToolBar(this);
+	toolbar = new QPEToolBar(this);
 	toolbar->setHorizontalStretchable(true);
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
@@ -7,4 +7,4 @@ class QAction;
 class OpenDiag;
-class QToolBar;
 class QListView;
+class QPEToolBar;
 class QTextBrowser;
@@ -21,3 +21,3 @@ protected:
 	QListView *attachments;
-	QToolBar *toolbar;
+	QPEToolBar *toolbar;
 	QTextBrowser *browser;