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/go | |
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/go/go.pro | 6 | ||||
-rw-r--r-- | noncore/games/go/gowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/games/go/gowidget.h | 3 | ||||
-rw-r--r-- | noncore/games/go/main.cpp | 13 | ||||
-rw-r--r-- | noncore/games/go/opie-go.control | 4 |
5 files changed, 12 insertions, 18 deletions
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro index 2bc0787..f6c6a54 100644 --- a/noncore/games/go/go.pro +++ b/noncore/games/go/go.pro | |||
@@ -1,9 +1,7 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | CONFIG = qt warn_on release quick-app |
2 | TEMPLATE= app | ||
3 | CONFIG = qt warn_on release | ||
4 | HEADERS = amigo.h \ | 2 | HEADERS = amigo.h \ |
5 | go.h \ | 3 | go.h \ |
6 | goplayutils.h \ | 4 | goplayutils.h \ |
7 | gowidget.h | 5 | gowidget.h |
8 | SOURCES = amigo.c \ | 6 | SOURCES = amigo.c \ |
9 | goplayer.c \ | 7 | goplayer.c \ |
@@ -13,7 +11,9 @@ SOURCES = amigo.c \ | |||
13 | main.cpp | 11 | main.cpp |
14 | INCLUDEPATH += $(OPIEDIR)/include | 12 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DEPENDPATH+= $(OPIEDIR)/include | 13 | DEPENDPATH+= $(OPIEDIR)/include |
16 | LIBS += -lqpe | 14 | LIBS += -lqpe |
17 | TARGET = go | 15 | TARGET = go |
18 | 16 | ||
17 | |||
18 | |||
19 | include ( $(OPIEDIR)/include.pro ) | 19 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp index 6d06f3b..cf89267 100644 --- a/noncore/games/go/gowidget.cpp +++ b/noncore/games/go/gowidget.cpp | |||
@@ -48,14 +48,14 @@ static QBrush *goBrush; | |||
48 | static QPixmap *newBlackStone; | 48 | static QPixmap *newBlackStone; |
49 | static QPixmap *blackStone; | 49 | static QPixmap *blackStone; |
50 | static QPixmap *whiteStone; | 50 | static QPixmap *whiteStone; |
51 | 51 | ||
52 | static bool smallStones = FALSE; | 52 | static bool smallStones = FALSE; |
53 | 53 | ||
54 | GoMainWidget::GoMainWidget( QWidget *parent, const char* name) : | 54 | GoMainWidget::GoMainWidget( QWidget *parent, const char* name, WFlags fl) : |
55 | QMainWindow( parent, name ) | 55 | QMainWindow( parent, name, fl ) |
56 | { | 56 | { |
57 | setToolBarsMovable( FALSE ); | 57 | setToolBarsMovable( FALSE ); |
58 | GoWidget *go = new GoWidget(this); | 58 | GoWidget *go = new GoWidget(this); |
59 | 59 | ||
60 | setCentralWidget(go); | 60 | setCentralWidget(go); |
61 | toolbar = new QToolBar(this); | 61 | toolbar = new QToolBar(this); |
diff --git a/noncore/games/go/gowidget.h b/noncore/games/go/gowidget.h index 94de2cc..429dc33 100644 --- a/noncore/games/go/gowidget.h +++ b/noncore/games/go/gowidget.h | |||
@@ -28,13 +28,14 @@ | |||
28 | class QToolBar; | 28 | class QToolBar; |
29 | 29 | ||
30 | class GoMainWidget : public QMainWindow | 30 | class GoMainWidget : public QMainWindow |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | GoMainWidget( QWidget *parent=0, const char* name=0); | 34 | static QString appName() { return QString::fromLatin1("go"); } |
35 | GoMainWidget( QWidget *parent=0, const char* name=0, WFlags fl = 0); | ||
35 | protected: | 36 | protected: |
36 | void resizeEvent( QResizeEvent * ); | 37 | void resizeEvent( QResizeEvent * ); |
37 | private: | 38 | private: |
38 | QToolBar *toolbar; | 39 | QToolBar *toolbar; |
39 | 40 | ||
40 | }; | 41 | }; |
diff --git a/noncore/games/go/main.cpp b/noncore/games/go/main.cpp index c7e2669..f24e3c3 100644 --- a/noncore/games/go/main.cpp +++ b/noncore/games/go/main.cpp | |||
@@ -19,17 +19,10 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "gowidget.h" | 21 | #include "gowidget.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <stdio.h> | 25 | #include <opie/oapplicationfactory.h> |
26 | |||
27 | OPIE_EXPORT_APP( OApplicationFactory<GoMainWidget> ) | ||
26 | 28 | ||
27 | int main( int argc, char ** argv) | ||
28 | { | ||
29 | QPEApplication app( argc, argv ); | ||
30 | |||
31 | GoMainWidget m; | ||
32 | m.setCaption( GoWidget::tr("Go") ); | ||
33 | app.showMainWidget( &m ); | ||
34 | return app.exec(); | ||
35 | } | ||
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control index b07e8be..95b319e 100644 --- a/noncore/games/go/opie-go.control +++ b/noncore/games/go/opie-go.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-go | 1 | Package: opie-go |
2 | Files: bin/go apps/Games/go.desktop pics/go | 2 | Files: plugins/application/libgo.so* bin/go apps/Games/go.desktop pics/go |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Opie Project <opie@handhelds.org> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Description: The game of Go | 8 | Description: The game of Go |
9 | A game for the Opie environment. | 9 | A game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |