Diffstat (limited to 'noncore/games/mindbreaker/mindbreaker.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/mindbreaker/mindbreaker.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index 1f554d2..aa4afd7 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp @@ -19,9 +19,10 @@ **********************************************************************/ #include "mindbreaker.h" -#include <qtopia/resource.h> +#include <opie2/oresource.h> + #include <qtopia/config.h> #include <qtopia/qpeapplication.h> #include <qtoolbar.h> @@ -138,9 +139,9 @@ QVector<QImage> Peg::normalPegs; QVector<QImage> Peg::specialPegs; void Peg::buildImages() { - QImage pegs = Resource::loadImage("mindbreaker/pegs"); + QImage pegs = Opie::Core::OResource::loadImage("mindbreaker/pegs"); int x = 0; int y = 0; int i; eggLevel = 0; @@ -156,9 +157,9 @@ void Peg::buildImages() smoothScale(adjusted_peg_size, adjusted_peg_size) )); x += peg_size; } - QImage image = Resource::loadImage("mindbreaker/mindbreaker"); + QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); /* copy from master image to functional images */ x = 0; y = panel_height; normalPegs.insert(8, @@ -288,11 +289,11 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) QToolBar *tb = new QToolBar(this); tb->setHorizontalStretchable( TRUE ); - QIconSet newicon = Resource::loadIconSet("new"); - new QToolButton(newicon, tr("New Game"), 0, - board, SLOT(clear()), tb, "NewGame"); + QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), tr("New Game"), 0, + board, SLOT(clear()), tb, "NewGame"); + btn->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); score = new QToolButton(tb); score->setText(""); score->setMaximumHeight(20); @@ -482,9 +483,9 @@ void MindBreakerBoard::doFixSize() setupBoardSize(s.width() - fw, s.height() - fw); canvas()->resize(s.width() - fw, s.height() - fw); Peg::buildImages(); // must be done BEFORE any pegs are made - QImage image = Resource::loadImage("mindbreaker/mindbreaker"); + QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); /* copy from master image to functional images */ int x = 0; int y = 0; |