summaryrefslogtreecommitdiff
path: root/core/pim
Side-by-side diff
Diffstat (limited to 'core/pim') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp4
-rw-r--r--core/pim/datebook/datebook.cpp4
-rw-r--r--core/pim/datebook2/mainwindow.cpp4
-rw-r--r--core/pim/osearch/mainwindow.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 438c270..406ced6 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -37,7 +37,7 @@
#include <qpe/qpemessagebox.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
// #include <qtoolbar.h>
// #include <qmenubar.h>
#include <qpe/qpeapplication.h>
@@ -93,7 +93,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
QPEToolBar *bar = new QPEToolBar( this );
bar->setHorizontalStretchable( TRUE );
- QPEMenuBar *mbList = new QPEMenuBar( bar );
+ QMenuBar *mbList = new QMenuBar( bar );
mbList->setMargin( 0 );
QPopupMenu *edit = new QPopupMenu( mbList );
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 07d7164..a040d7c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -36,7 +36,7 @@
#include <qpe/event.h>
#include <qpe/finddialog.h>
#include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
#include <qpe/sound.h>
@@ -103,7 +103,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
// QPEToolBar *bar = new QPEToolBar( this );
// bar->setHorizontalStretchable( TRUE );
-// QPEMenuBar *mb = new QPEMenuBar( bar );
+// QMenuBar *mb = new QMenuBar( bar );
// mb->setMargin( 0 );
// QPopupMenu *view = new QPopupMenu( this );
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 68525b3..7d436ae 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -8,7 +8,7 @@
#include <qpe/qpeapplication.h>
#include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
@@ -93,7 +93,7 @@ void MainWindow::initUI() {
m_toolBar = new QPEToolBar( this );
m_toolBar->setHorizontalStretchable( TRUE );
- QPEMenuBar* mb = new QPEMenuBar( m_toolBar );
+ QMenuBar* mb = new QMenuBar( m_toolBar );
m_popView = new QPopupMenu( this );
m_popSetting = new QPopupMenu( this );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index f768d81..80738df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -28,7 +28,7 @@
#include <qtextbrowser.h>
#include <qregexp.h>
#include <qwhatsthis.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
#include <qpe/config.h>
@@ -115,7 +115,7 @@ void MainWindow::makeMenu()
{
QPEToolBar *toolBar = new QPEToolBar( this );
QPEToolBar *searchBar = new QPEToolBar(this);
- QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+ QMenuBar *menuBar = new QMenuBar( toolBar );
QPopupMenu *searchMenu = new QPopupMenu( menuBar );
// QPopupMenu *viewMenu = new QPopupMenu( menuBar );
QPopupMenu *cfgMenu = new QPopupMenu( menuBar );