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
@@ -9,5 +9,5 @@
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
@@ -22,5 +22,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
         menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
@@ -126,5 +126,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         attachWindow->hide();
 
-        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
@@ -8,5 +8,5 @@ class MailStatusBar;
 class ListViewPlus;
 class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
@@ -43,5 +43,5 @@ protected:
         QMainWindow *attachWindow;
         QPopupMenu *attachPopup;
-        QPEToolBar *toolbar, *attachToolbar;
+        QToolBar *toolbar, *attachToolbar;
          QMenuBar *menubar;
         QPopupMenu *mailmenu;
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
@@ -6,5 +6,5 @@
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
@@ -20,5 +20,5 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
         menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
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
@@ -7,5 +7,5 @@ class ServerConnection;
 class MailStatusBar;
 class FolderWidget;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
@@ -27,5 +27,5 @@ protected:
         MailStatusBar *status;
         FolderWidget *folderView;
-        QPEToolBar *toolbar;
+        QToolBar *toolbar;
          QMenuBar *menubar;
         QPopupMenu *mailmenu, *servermenu;
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
@@ -7,5 +7,5 @@
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
@@ -19,5 +19,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
-        toolbar = new QPEToolBar(this);
+        toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
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
@@ -7,5 +7,5 @@ class QAction;
 class OpenDiag;
 class QListView;
-class QPEToolBar;
+class QToolBar;
 class QTextBrowser;
 class QMenuBar;
@@ -22,5 +22,5 @@ protected:
         QAction *reply, *forward, *attachbutton, *deleteMail;
         QListView *attachments;
-        QPEToolBar *toolbar;
+        QToolBar *toolbar;
         QTextBrowser *browser;
         OpenDiag *openDiag;