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 /noncore/apps | |
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-- | noncore/apps/checkbook/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bartender.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/budgetdisplay.cpp | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/budgetdisplay.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.cpp | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.h | 4 | ||||
-rw-r--r-- | noncore/apps/tableviewer/tableviewer.cpp | 2 |
12 files changed, 15 insertions, 21 deletions
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp index bf00102..25f9910 100644 --- a/noncore/apps/checkbook/mainwindow.cpp +++ b/noncore/apps/checkbook/mainwindow.cpp @@ -67,5 +67,5 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl ) QPEToolBar *bar = new QPEToolBar( this ); bar->setHorizontalStretchable( TRUE ); - QPEMenuBar *mb = new QPEMenuBar( bar ); + QMenuBar *mb = new QMenuBar( bar ); mb->setMargin( 0 ); QPopupMenu *popup = new QPopupMenu( this ); diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 58538af..4fe45ba 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp @@ -13,10 +13,4 @@ #include "mainwindow.h" -#include <opie2/omenubar.h> -#include <opie2/omessagebox.h> -#include <opie2/oresource.h> -#include <opie2/oconfig.h> -#include <opie2/otoolbar.h> -#include <opie2/oapplication.h> #include <qaction.h> #include <qmessagebox.h> diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp index 5661ad5..3a0d8d1 100644 --- a/noncore/apps/opie-bartender/bartender.cpp +++ b/noncore/apps/opie-bartender/bartender.cpp @@ -68,5 +68,5 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 ); - QPEMenuBar *menuBar = new QPEMenuBar( ToolBar1 ); + QMenuBar *menuBar = new QMenuBar( ToolBar1 ); QPopupMenu *fileMenu; fileMenu = new QPopupMenu( this); diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 087ce00..8c0d138 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp @@ -283,5 +283,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) #ifdef USEQPE - mb = new QPEMenuBar( menubar ); + mb = new QMenuBar( menubar ); #else mb = new QMenuBar( menubar ); diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h index 2765d47..86c14b1 100644 --- a/noncore/apps/opie-reader/QTReaderApp.h +++ b/noncore/apps/opie-reader/QTReaderApp.h @@ -46,5 +46,5 @@ class QToolBar; #ifdef USEQPE
class QPEToolBar; -class QPEMenuBar;
+class QMenuBar;
#endif class CBkmkSelector; @@ -384,5 +384,5 @@ private slots: QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar; #ifdef USEQPE
- QPEMenuBar *mb;
+ QMenuBar *mb;
#else
QMenuBar *mb;
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index 3915e52..fb2ca79 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp @@ -362,5 +362,5 @@ void MainWindow::initActions() void MainWindow::initMenu() { - menu=new QPEMenuBar(this); + menu=new QMenuBar(this); menuFile=new QPopupMenu; diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h index 370d82e..4007f88 100644 --- a/noncore/apps/opie-sheet/mainwindow.h +++ b/noncore/apps/opie-sheet/mainwindow.h @@ -18,5 +18,5 @@ #include <qpe/applnk.h> #include <qpe/fileselector.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #include <qmainwindow.h> @@ -41,5 +41,5 @@ class MainWindow: public QMainWindow // QPE objects DocLnk* currentDoc; - QPEMenuBar *menu; + QMenuBar *menu; QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; FileSelector *fileSelector; diff --git a/noncore/apps/qashmoney/budgetdisplay.cpp b/noncore/apps/qashmoney/budgetdisplay.cpp index afc6a2d..492595a 100755 --- a/noncore/apps/qashmoney/budgetdisplay.cpp +++ b/noncore/apps/qashmoney/budgetdisplay.cpp @@ -34,5 +34,5 @@ BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent ) secondline->setSpacing ( 10 ); - menu = new QPEMenuBar ( this ); + menu = new QMenuBar ( this ); menu->setFrameStyle ( QFrame::Box | QFrame::Sunken ); budgetmenu = new QPopupMenu ( this ); diff --git a/noncore/apps/qashmoney/budgetdisplay.h b/noncore/apps/qashmoney/budgetdisplay.h index 3976ce1..a4e806c 100755 --- a/noncore/apps/qashmoney/budgetdisplay.h +++ b/noncore/apps/qashmoney/budgetdisplay.h @@ -10,5 +10,5 @@ #include <qstringlist.h> #include <qdatetime.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qhbox.h> @@ -23,5 +23,5 @@ class BudgetDisplay : public QWidget BudgetDisplay ( QWidget *parent ); - QPEMenuBar *menu; + QMenuBar *menu; QPopupMenu *budgetmenu; QPopupMenu *lineitemsmenu; diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp index 20e8d32..e985f0b 100755 --- a/noncore/apps/qashmoney/qashmoney.cpp +++ b/noncore/apps/qashmoney/qashmoney.cpp @@ -24,5 +24,5 @@ QashMoney::QashMoney () : QWidget () // Create new menubar for our mainwindow // and add menu items - mainmenu = new QPEMenuBar ( this ); + mainmenu = new QMenuBar ( this ); mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); preferencesmenu = new QPopupMenu ( this ); diff --git a/noncore/apps/qashmoney/qashmoney.h b/noncore/apps/qashmoney/qashmoney.h index ec2c7ec..f2c456c 100755 --- a/noncore/apps/qashmoney/qashmoney.h +++ b/noncore/apps/qashmoney/qashmoney.h @@ -2,5 +2,5 @@ #define QASHMONEY_H -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qlayout.h> @@ -31,5 +31,5 @@ class QashMoney : public QWidget QWidget* tab_3; - QPEMenuBar *mainmenu; + QMenuBar *mainmenu; QPopupMenu *preferencesmenu; QPopupMenu *utilitiesmenu; diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp index fbb5c24..fdf0072 100644 --- a/noncore/apps/tableviewer/tableviewer.cpp +++ b/noncore/apps/tableviewer/tableviewer.cpp @@ -67,5 +67,5 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f /* build menus */ - menu = new QPEMenuBar(this, 0); + menu = new QMenuBar(this, 0); QPopupMenu *file_menu = new QPopupMenu; |