author | drw <drw> | 2005-05-21 20:11:55 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-21 20:11:55 (UTC) |
commit | afb929e7fd04ecdfec2799a5cf9cf298d1af77c6 (patch) (unidiff) | |
tree | 5db439fca569cf1349220f3fbbf155405d13a80d /noncore/games/mindbreaker | |
parent | d56ca82c22c3ac6b7dfb0bb7b4d5a0e5ad1ff4f1 (diff) | |
download | opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.zip opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.tar.gz opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/games/mindbreaker/config.in | 2 | ||||
-rw-r--r-- | noncore/games/mindbreaker/mindbreaker.cpp | 15 | ||||
-rw-r--r-- | noncore/games/mindbreaker/opie-mindbreaker.control | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in index b97a9e8..e3c0812 100644 --- a/noncore/games/mindbreaker/config.in +++ b/noncore/games/mindbreaker/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config MINDBREAKER | 1 | config MINDBREAKER |
2 | boolean "opie-mindbreaker (crack the coloured code)" | 2 | boolean "opie-mindbreaker (crack the coloured code)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
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 | |||
@@ -20,7 +20,8 @@ | |||
20 | 20 | ||
21 | #include "mindbreaker.h" | 21 | #include "mindbreaker.h" |
22 | 22 | ||
23 | #include <qtopia/resource.h> | 23 | #include <opie2/oresource.h> |
24 | |||
24 | #include <qtopia/config.h> | 25 | #include <qtopia/config.h> |
25 | #include <qtopia/qpeapplication.h> | 26 | #include <qtopia/qpeapplication.h> |
26 | #include <qtoolbar.h> | 27 | #include <qtoolbar.h> |
@@ -139,7 +140,7 @@ QVector<QImage> Peg::specialPegs; | |||
139 | 140 | ||
140 | void Peg::buildImages() | 141 | void Peg::buildImages() |
141 | { | 142 | { |
142 | QImage pegs = Resource::loadImage("mindbreaker/pegs"); | 143 | QImage pegs = Opie::Core::OResource::loadImage("mindbreaker/pegs"); |
143 | int x = 0; | 144 | int x = 0; |
144 | int y = 0; | 145 | int y = 0; |
145 | int i; | 146 | int i; |
@@ -157,7 +158,7 @@ void Peg::buildImages() | |||
157 | x += peg_size; | 158 | x += peg_size; |
158 | } | 159 | } |
159 | 160 | ||
160 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); | 161 | QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); |
161 | /* copy from master image to functional images */ | 162 | /* copy from master image to functional images */ |
162 | x = 0; | 163 | x = 0; |
163 | y = panel_height; | 164 | y = panel_height; |
@@ -289,9 +290,9 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) | |||
289 | QToolBar *tb = new QToolBar(this); | 290 | QToolBar *tb = new QToolBar(this); |
290 | tb->setHorizontalStretchable( TRUE ); | 291 | tb->setHorizontalStretchable( TRUE ); |
291 | 292 | ||
292 | QIconSet newicon = Resource::loadIconSet("new"); | 293 | QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), tr("New Game"), 0, |
293 | new QToolButton(newicon, tr("New Game"), 0, | 294 | board, SLOT(clear()), tb, "NewGame"); |
294 | board, SLOT(clear()), tb, "NewGame"); | 295 | btn->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); |
295 | 296 | ||
296 | score = new QToolButton(tb); | 297 | score = new QToolButton(tb); |
297 | score->setText(""); | 298 | score->setText(""); |
@@ -483,7 +484,7 @@ void MindBreakerBoard::doFixSize() | |||
483 | canvas()->resize(s.width() - fw, s.height() - fw); | 484 | canvas()->resize(s.width() - fw, s.height() - fw); |
484 | Peg::buildImages(); // must be done BEFORE any pegs are made | 485 | Peg::buildImages(); // must be done BEFORE any pegs are made |
485 | 486 | ||
486 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); | 487 | QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); |
487 | 488 | ||
488 | /* copy from master image to functional images */ | 489 | /* copy from master image to functional images */ |
489 | int x = 0; | 490 | int x = 0; |
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control index 5b342da..d3826fd 100644 --- a/noncore/games/mindbreaker/opie-mindbreaker.control +++ b/noncore/games/mindbreaker/opie-mindbreaker.control | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 5 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Game: crack the coloured code | 8 | Description: Game: crack the coloured code |
9 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |