summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/kpacman/kpacman.cpp4
-rw-r--r--noncore/games/kpacman/kpacman.h4
-rw-r--r--noncore/games/kpacman/kpacman.pro4
-rw-r--r--noncore/games/kpacman/main.cpp27
-rw-r--r--noncore/games/kpacman/opie-kpacman.control2
5 files changed, 9 insertions, 32 deletions
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index 9820e5a..4a3b870 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -4,26 +4,26 @@
#if defined( KDE2_PORT )
#include <kpacman.h>
#include <kpacman.moc>
#include <kcolordlg.h>
#elif defined( QPE_PORT )
#include <qmenubar.h>
#include <qpe/config.h>
#include <qapplication.h>
#include "kpacman.h"
#endif
-Kpacman::Kpacman(QWidget *parent, const char *name)
- : KTMainWindow(parent, name)
+Kpacman::Kpacman(QWidget *parent, const char *name, WFlags fl)
+ : KTMainWindow(parent, name,fl)
{
schemesPopup = new QList<QPopupMenu>;
schemesPopup->setAutoDelete(TRUE);
menu();
m_view = new QWidget( this, "m_view" );
m_view->setBackgroundColor( black );
m_layout = new QGridLayout( m_view );
m_layout->setMargin( 7 );
view = new KpacmanWidget( this, QString(name)+"widget");
diff --git a/noncore/games/kpacman/kpacman.h b/noncore/games/kpacman/kpacman.h
index 2c1de70..829714a 100644
--- a/noncore/games/kpacman/kpacman.h
+++ b/noncore/games/kpacman/kpacman.h
@@ -19,25 +19,27 @@ class QMenuBar;
#include <qfileinf.h>
#include <qlayout.h>
#include "referee.h"
#include "status.h"
#include "score.h"
#include "keys.h"
class Kpacman : public KTMainWindow
{
Q_OBJECT
public:
- Kpacman(QWidget *parent = 0, const char *name = 0);
+ Kpacman(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+ static QString appName() { return QString::fromLatin1("kpacman"); }
+
virtual ~Kpacman();
public slots:
void forcedHallOfFame(bool);
private slots:
void newKpacman();
void pauseKpacman();
void toggleHallOfFame();
void toggleNew();
void togglePaused();
void quitKpacman();
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index 45314f9..a231b01 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -1,14 +1,13 @@
-TEMPLATE = app
-CONFIG = qt warn_on
+CONFIG = qt quick-app
HEADERS = kpacmanwidget.h \
referee.h \
status.h \
painter.h \
score.h \
pacman.h \
monster.h \
keys.h \
fruit.h \
energizer.h \
board.h \
bitfont.h \
@@ -24,16 +23,15 @@ SOURCES = kpacmanwidget.cpp \
pacman.cpp \
monster.cpp \
keys.cpp \
fruit.cpp \
energizer.cpp \
board.cpp \
bitfont.cpp \
kpacman.cpp \
main.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
-DESTDIR = $(OPIEDIR)/bin
TARGET = kpacman
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kpacman/main.cpp b/noncore/games/kpacman/main.cpp
index 76afb57..2906d2a 100644
--- a/noncore/games/kpacman/main.cpp
+++ b/noncore/games/kpacman/main.cpp
@@ -13,54 +13,31 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "portable.h"
#if defined( KDE2_PORT )
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <klocale.h>
#elif defined( QPE_PORT )
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
#endif
#include "kpacman.h"
#ifdef KDE2_PORT
static const char *description =
I18N_NOOP("Kpacman");
// INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
static KCmdLineOptions options[] =
{
{ 0, 0, 0 }
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
#endif
-int main(int argc, char *argv[])
-{
-#if defined( KDE2_PORT )
- KAboutData aboutData( "kpacman", I18N_NOOP("Kpacman"),
- VERSION, description, KAboutData::License_GPL,
- "(c) 2002, Jörg Thönnissen", 0, 0, "joe@dsite.de");
- aboutData.addAuthor("Jörg Thönnissen",0, "joe@dsite.de");
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication a;
-#elif defined( QPE_PORT )
- QPEApplication a( argc, argv );
-#endif
- Kpacman *kpacman = new Kpacman( NULL, "Kpacman" );
- a.setMainWidget(kpacman);
-#if defined( KDE2_PORT )
- a.setTopWidget(kpacman);
- kpacman->show();
-#elif defined( QPE_PORT )
- kpacman->showMaximized();
-#endif
-
- return a.exec();
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Kpacman> )
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control
index 15e3056..68487ec 100644
--- a/noncore/games/kpacman/opie-kpacman.control
+++ b/noncore/games/kpacman/opie-kpacman.control
@@ -1,11 +1,11 @@
Package: opie-kpacman
-Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
+Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
Version: 0.3.1-$SUB_VERSION
Depends: task-opie-minimal
Priority: optional
Section: opie/games
Maintainer: Catalin Climov <catalin@climov.com>
Architecture: arm
License: GPL
Description: Kpacman
A Pacman clone for Qtopia.