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
@@ -3,5 +3,4 @@
 #include <qcombobox.h>
 #include <qlineedit.h>
-#include <qtoolbar.h>
 #include <qlayout.h>
 #include <qaction.h>
@@ -9,4 +8,5 @@
 #include <qvbox.h>
 
+#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
@@ -20,5 +20,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
-        toolbar = new QToolBar(this);
+        toolbar = new QPEToolBar(this);
         addToolBar(toolbar);
         toolbar->setHorizontalStretchable(true);
@@ -117,5 +117,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         attachWindow->hide();
 
-        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
@@ -7,7 +7,7 @@ class QMultiLineEdit;
 class ListViewPlus;
 class QPopupMenu;
+class QPEToolBar;
 class QComboBox;
 class QLineEdit;
-class QToolBar;
 class QAction;
 class QLabel;
@@ -39,7 +39,7 @@ protected:
         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
@@ -2,5 +2,4 @@
 #include <qtoolbutton.h>
 #include <qpopupmenu.h>
-#include <qtoolbar.h>
 #include <qaction.h>
 #include <qheader.h>
@@ -8,4 +7,5 @@
 #include <qvbox.h>
 
+#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
@@ -20,5 +20,5 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         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
@@ -7,6 +7,6 @@ class ServerConnection;
 class QProgressBar;
 class FolderWidget;
+class QPEToolBar;
 class MailTable;
-class QToolBar;
 class QAction;
 class QLabel;
@@ -26,6 +26,6 @@ protected:
         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,9 +1,9 @@
 #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>
 
@@ -17,5 +17,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         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
@@ -6,6 +6,6 @@
 class QAction;
 class OpenDiag;
-class QToolBar;
 class QListView;
+class QPEToolBar;
 class QTextBrowser;
 
@@ -20,5 +20,5 @@ protected:
         QAction *reply, *forward, *attachbutton, *deleteMail;
         QListView *attachments;
-        QToolBar *toolbar;
+        QPEToolBar *toolbar;
         QTextBrowser *browser;
         OpenDiag *openDiag;