author | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
commit | 0c74629e8f5c12a9b5a282b817f884fa10dee491 (patch) (unidiff) | |
tree | 3294663b92023f8d24d68a01022e011a3c94002d /noncore/games/snake | |
parent | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (diff) | |
download | opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.zip opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.gz opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.bz2 |
Merge from the 1.0.x release
-rw-r--r-- | noncore/games/snake/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/games/snake/interface.h | 3 | ||||
-rw-r--r-- | noncore/games/snake/main.cpp | 10 | ||||
-rw-r--r-- | noncore/games/snake/opie-snake.control | 2 | ||||
-rw-r--r-- | noncore/games/snake/snake.pro | 5 |
5 files changed, 10 insertions, 12 deletions
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp index f1227cb..2c60693 100644 --- a/noncore/games/snake/interface.cpp +++ b/noncore/games/snake/interface.cpp | |||
@@ -23,2 +23,3 @@ | |||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/qpeapplication.h> | ||
24 | 25 | ||
@@ -35,2 +36,3 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) : | |||
35 | setCaption( tr("Snake") ); | 36 | setCaption( tr("Snake") ); |
37 | QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff ); | ||
36 | QPixmap bg = Resource::loadPixmap("snake/grass"); | 38 | QPixmap bg = Resource::loadPixmap("snake/grass"); |
diff --git a/noncore/games/snake/interface.h b/noncore/games/snake/interface.h index 454d4ee..fa1dee4 100644 --- a/noncore/games/snake/interface.h +++ b/noncore/games/snake/interface.h | |||
@@ -20,2 +20,3 @@ | |||
20 | #include <qmainwindow.h> | 20 | #include <qmainwindow.h> |
21 | #include <qpe/qpeapplication.h> | ||
21 | #include <qcanvas.h> | 22 | #include <qcanvas.h> |
@@ -39,2 +40,4 @@ public: | |||
39 | 40 | ||
41 | static QString appName() { return QString::fromLatin1("snake"); } | ||
42 | |||
40 | protected: | 43 | protected: |
diff --git a/noncore/games/snake/main.cpp b/noncore/games/snake/main.cpp index 90a93b7..77a2769 100644 --- a/noncore/games/snake/main.cpp +++ b/noncore/games/snake/main.cpp | |||
@@ -23,13 +23,7 @@ | |||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | 26 | ||
26 | int main(int argc, char **argv) | 27 | OPIE_EXPORT_APP( OApplicationFactory<SnakeGame> ) |
27 | { | ||
28 | QPEApplication app(argc,argv); | ||
29 | 28 | ||
30 | SnakeGame* m = new SnakeGame; | ||
31 | QPEApplication::setInputMethodHint( m, QPEApplication::AlwaysOff ); | ||
32 | app.showMainWidget(m); | ||
33 | 29 | ||
34 | return app.exec(); | ||
35 | } | ||
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control index ef4fc61..f110acd 100644 --- a/noncore/games/snake/opie-snake.control +++ b/noncore/games/snake/opie-snake.control | |||
@@ -1,3 +1,3 @@ | |||
1 | Package: opie-snake | 1 | Package: opie-snake |
2 | Files: bin/snake apps/Games/snake.desktop pics/snake | 2 | Files: plugins/application/libsnake.so* bin/snake apps/Games/snake.desktop pics/snake |
3 | Priority: optional | 3 | Priority: optional |
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro index 3da8631..2b7444c 100644 --- a/noncore/games/snake/snake.pro +++ b/noncore/games/snake/snake.pro | |||
@@ -1,4 +1,2 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = snake.h target.h obstacle.h interface.h codes.h | 2 | HEADERS = snake.h target.h obstacle.h interface.h codes.h |
@@ -10,2 +8,3 @@ LIBS += -lqpe | |||
10 | 8 | ||
9 | |||
11 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |