| author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
| commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (side-by-side diff) | |
| tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /core/pim | |
| parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
| download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 | |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
| -rw-r--r-- | core/pim/addressbook/addressbook.cpp | 4 | ||||
| -rw-r--r-- | core/pim/datebook/datebook.cpp | 4 | ||||
| -rw-r--r-- | core/pim/datebook2/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | core/pim/osearch/mainwindow.cpp | 4 |
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 @@ -38,5 +38,5 @@ #include <qpe/qcopenvelope_qws.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> // #include <qtoolbar.h> // #include <qmenubar.h> @@ -94,5 +94,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, bar->setHorizontalStretchable( TRUE ); - QPEMenuBar *mbList = new QPEMenuBar( bar ); + QMenuBar *mbList = new QMenuBar( bar ); mbList->setMargin( 0 ); 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 @@ -37,5 +37,5 @@ #include <qpe/finddialog.h> #include <qpe/ir.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpemessagebox.h> #include <qpe/resource.h> @@ -104,5 +104,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) // bar->setHorizontalStretchable( TRUE ); -// QPEMenuBar *mb = new QPEMenuBar( bar ); +// QMenuBar *mb = new QMenuBar( bar ); // mb->setMargin( 0 ); 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 @@ -9,5 +9,5 @@ #include <qpe/qpeapplication.h> #include <qpe/ir.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/qpemessagebox.h> @@ -94,5 +94,5 @@ void MainWindow::initUI() { m_toolBar->setHorizontalStretchable( TRUE ); - QPEMenuBar* mb = new QPEMenuBar( m_toolBar ); + QMenuBar* mb = new QMenuBar( m_toolBar ); m_popView = 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 @@ -29,5 +29,5 @@ #include <qregexp.h> #include <qwhatsthis.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpemessagebox.h> #include <qpe/resource.h> @@ -116,5 +116,5 @@ 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 ); |