author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (side-by-side diff) | |
tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/games | |
parent | c648101ca50a9782911b58b5158b31e1d0427ab3 (diff) | |
download | opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2 |
s/QPEToolBar/QToolBar:
- remove usage of deprecated classses
- makes it easier to migrate to OToolBar in the future
-rw-r--r-- | noncore/games/backgammon/backgammon.cpp | 2 | ||||
-rw-r--r-- | noncore/games/fifteen/fifteen.cpp | 4 | ||||
-rw-r--r-- | noncore/games/go/gowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/games/mindbreaker/mindbreaker.cpp | 2 | ||||
-rw-r--r-- | noncore/games/minesweep/minesweep.cpp | 4 | ||||
-rw-r--r-- | noncore/games/parashoot/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/games/snake/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/games/solitaire/canvascardgame.cpp | 2 | ||||
-rw-r--r-- | noncore/games/wordgame/wordgame.cpp | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index 755ed10..e9e5467 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp @@ -14,9 +14,9 @@ #include <qtimer.h> #include <qmainwindow.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include <stdlib.h> diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp index 212f7b1..2e4ed94 100644 --- a/noncore/games/fifteen/fifteen.cpp +++ b/noncore/games/fifteen/fifteen.cpp @@ -29,9 +29,9 @@ #include <qpainter.h> #include <qpopupmenu.h> #include <qmessagebox.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qstringlist.h> #include <qapplication.h> #include <stdlib.h> @@ -47,9 +47,9 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) QVBox *vbox = new QVBox( this ); PiecesTable *table = new PiecesTable( vbox ); setCentralWidget(vbox); - QPEToolBar *toolbar = new QPEToolBar(this); + QToolBar *toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); addToolBar(toolbar); QMenuBar *menubar = new QMenuBar( toolbar ); diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp index 476f7ce1..6d06f3b 100644 --- a/noncore/games/go/gowidget.cpp +++ b/noncore/games/go/gowidget.cpp @@ -25,9 +25,9 @@ #include <qpainter.h> #include <qpixmap.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qaction.h> #include <qapplication.h> //processEvents() #include <qlabel.h> @@ -57,9 +57,9 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name) : setToolBarsMovable( FALSE ); GoWidget *go = new GoWidget(this); setCentralWidget(go); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); addToolBar(toolbar); QMenuBar *mb = new QMenuBar( toolbar ); diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index 1a1d05d..7802e38 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp @@ -213,9 +213,9 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) setCentralWidget(m); setToolBarsMovable( FALSE ); - QPEToolBar *tb = new QPEToolBar(this); + QToolBar *tb = new QToolBar(this); tb->setHorizontalStretchable( TRUE ); QPixmap newicon = Resource::loadPixmap("new"); new QToolButton(newicon, tr("New Game"), 0, diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp index 814070b..48644b3 100644 --- a/noncore/games/minesweep/minesweep.cpp +++ b/noncore/games/minesweep/minesweep.cpp @@ -24,9 +24,9 @@ #include <qpe/resource.h> #include <qpe/config.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qpushbutton.h> #include <qlcdnumber.h> #include <qmessagebox.h> @@ -242,9 +242,9 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) srand(::time(0)); setCaption( tr("Mine Hunt") ); setIcon( Resource::loadPixmap( "minesweep_icon" ) ); - QPEToolBar *toolBar = new QPEToolBar( this ); + QToolBar *toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); QMenuBar *menuBar = new QMenuBar( toolBar ); diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp index 84e5e60..db98720 100644 --- a/noncore/games/parashoot/interface.cpp +++ b/noncore/games/parashoot/interface.cpp @@ -44,9 +44,9 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) : pb->setFocus(); setToolBarsMovable( FALSE ); - QPEToolBar* toolbar = new QPEToolBar(this); + QToolBar* toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); setCaption( tr("ParaShoot") ); QPixmap newicon = Resource::loadPixmap("parashoot/manicon"); diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp index 68e0f14..f1227cb 100644 --- a/noncore/games/snake/interface.cpp +++ b/noncore/games/snake/interface.cpp @@ -44,9 +44,9 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) : connect(pauseTimer, SIGNAL(timeout()), this, SLOT(wait()) ); setToolBarsMovable( FALSE ); - QPEToolBar* toolbar = new QPEToolBar( this); + QToolBar* toolbar = new QToolBar( this); toolbar->setHorizontalStretchable( TRUE ); QPixmap newicon = Resource::loadPixmap("ksnake"); setIcon(newicon); diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp index 8250193..9ae2a23 100644 --- a/noncore/games/solitaire/canvascardgame.cpp +++ b/noncore/games/solitaire/canvascardgame.cpp @@ -26,9 +26,9 @@ #include <qpe/resource.h> #include <qpe/config.h> #include <qmainwindow.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpainter.h> #include <qgfx_qws.h> #include <stdlib.h> diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index d46e824..c01551d 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp @@ -133,9 +133,9 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) : setToolBarsMovable( FALSE ); vbox = new QVBox(this); setCentralWidget(vbox); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); addToolBar(toolbar, Bottom); reset = new QToolButton(Resource::loadPixmap("back"), tr("Back"), "", this, SLOT(resetTurn()), toolbar); done = new QToolButton(Resource::loadPixmap("done"), tr("Done"), "", this, SLOT(endTurn()), toolbar); scoreinfo = new ScoreInfo(toolbar); |