summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/oyatzee/main.cpp12
-rw-r--r--noncore/games/oyatzee/opie-oyatzee.control2
-rw-r--r--noncore/games/oyatzee/oyatzee.h1
-rw-r--r--noncore/games/oyatzee/oyatzee.pro4
4 files changed, 5 insertions, 14 deletions
diff --git a/noncore/games/oyatzee/main.cpp b/noncore/games/oyatzee/main.cpp
index 1fd51f6..a5c19f0 100644
--- a/noncore/games/oyatzee/main.cpp
+++ b/noncore/games/oyatzee/main.cpp
@@ -1,13 +1,5 @@
#include "oyatzee.h"
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
-int main( int argc, char ** argv )
-{
- QPEApplication a( argc, argv );
-
- OYatzee mw;
- a.showMainWidget(&mw);
-
- return a.exec();
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<OYatzee> )
diff --git a/noncore/games/oyatzee/opie-oyatzee.control b/noncore/games/oyatzee/opie-oyatzee.control
index 8249fed..4eb096c 100644
--- a/noncore/games/oyatzee/opie-oyatzee.control
+++ b/noncore/games/oyatzee/opie-oyatzee.control
@@ -1,11 +1,11 @@
Package: opie-oyatzee
-Files: bin/oyatzee apps/Games/oyatzee.desktop pics/oyatzee
+Files: plugins/applications/liboyatzee.so* bin/oyatzee apps/Games/oyatzee.desktop pics/oyatzee
Priority: optional
Section: opie/games
Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
Architecture: arm
Depends: task-opie-minimal
Description: Yatzee-like game
A Yatzee game for the Opie environment.
Play against the computer or human opponents.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h
index 048a733..a38182d 100644
--- a/noncore/games/oyatzee/oyatzee.h
+++ b/noncore/games/oyatzee/oyatzee.h
@@ -21,24 +21,25 @@ class QPoint;
typedef QList<Dice> dicesList;
typedef QList<Resultboard> resultboardList;
typedef QValueList<int> QValueListInt;
typedef QList<Player> playerList;
typedef QMap<int,int> pointMap;
class OYatzee : public QMainWindow {
Q_OBJECT
public:
OYatzee( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~OYatzee();
+ static QString appName() { return QString::fromLatin1("oyatzee"); }
Game *g();
DiceWidget *dw;
Scoreboard *sb;
QValueListInt posibilities;
playerList ps;
void setPlayerNumber( const int num );
void setRoundsNumber( const int num );
enum { Ones = 1,
diff --git a/noncore/games/oyatzee/oyatzee.pro b/noncore/games/oyatzee/oyatzee.pro
index f505c66..208535a 100644
--- a/noncore/games/oyatzee/oyatzee.pro
+++ b/noncore/games/oyatzee/oyatzee.pro
@@ -1,11 +1,9 @@
-TEMPLATE = app
-CONFIG = qt warn_on
-DESTDIR = $(OPIEDIR)/bin
+CONFIG = qt quick-app
HEADERS = oyatzee.h
SOURCES = main.cpp oyatzee.cpp
TARGET = oyatzee
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
include ( $(OPIEDIR)/include.pro )