6 files changed, 13 insertions, 13 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 34d6eb6..94de15c 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -10,3 +10,3 @@
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
@@ -23,3 +23,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
         menubar = new QMenuBar( toolbar );
@@ -127,3 +127,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 
-        attachToolbar = new QPEToolBar(attachWindow);
+        attachToolbar = new QToolBar(attachWindow);
         attachToolbar->setVerticalStretchable(true);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index 2c832d6..c14144b 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -9,3 +9,3 @@ class ListViewPlus;
 class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
@@ -44,3 +44,3 @@ protected:
         QPopupMenu *attachPopup;
-        QPEToolBar *toolbar, *attachToolbar;
+        QToolBar *toolbar, *attachToolbar;
          QMenuBar *menubar;
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 119acfb..4e804c2 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -7,3 +7,3 @@
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
@@ -21,3 +21,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
         menubar = new QMenuBar( toolbar );
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index b2e1dc5..c1d6371 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -8,3 +8,3 @@ class MailStatusBar;
 class FolderWidget;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
@@ -28,3 +28,3 @@ protected:
         FolderWidget *folderView;
-        QPEToolBar *toolbar;
+        QToolBar *toolbar;
          QMenuBar *menubar;
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index 10aa14d..f72026f 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -8,3 +8,3 @@
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
@@ -20,3 +20,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 6e55021..898522e 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -8,3 +8,3 @@ class OpenDiag;
 class QListView;
-class QPEToolBar;
+class QToolBar;
 class QTextBrowser;
@@ -23,3 +23,3 @@ protected:
         QListView *attachments;
-        QPEToolBar *toolbar;
+        QToolBar *toolbar;
         QTextBrowser *browser;