summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/zsame/ZSameWidget.cpp8
-rw-r--r--noncore/games/zsame/config.in2
-rw-r--r--noncore/games/zsame/opie-zsame.control2
-rw-r--r--noncore/games/zsame/zsame.pro2
4 files changed, 7 insertions, 7 deletions
diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp
index 45a877f..3c58c93 100644
--- a/noncore/games/zsame/ZSameWidget.cpp
+++ b/noncore/games/zsame/ZSameWidget.cpp
@@ -1,67 +1,67 @@
1/* Yo Emacs, this is -*- C++ -*- */ 1/* Yo Emacs, this is -*- C++ -*- */
2/* 2/*
3 * ksame 0.4 - simple Game 3 * ksame 0.4 - simple Game
4 * Copyright (C) 1997,1998 Marcus Kreutzberger 4 * Copyright (C) 1997,1998 Marcus Kreutzberger
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 * 19 *
20 */ 20 */
21 21
22#include <stdio.h> 22#include <stdio.h>
23 23
24#include <opie2/oapplicationfactory.h>
25
26#include <qpe/resource.h>
27
24#include <qtoolbar.h> 28#include <qtoolbar.h>
25#include <qmenubar.h> 29#include <qmenubar.h>
26
27#include <qapplication.h> 30#include <qapplication.h>
28#include <qaction.h> 31#include <qaction.h>
29#include <qmessagebox.h> 32#include <qmessagebox.h>
30 33
31#include <qpe/resource.h>
32#include <opie/oapplicationfactory.h>
33#include <kapplication.h> 34#include <kapplication.h>
34 35
35
36#include "ZSameWidget.h" 36#include "ZSameWidget.h"
37 37
38static int default_colors=3; 38static int default_colors=3;
39 39
40#define i18n tr 40#define i18n tr
41 41
42 42
43OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> ) 43OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> )
44 44
45 45
46 46
47ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl ) 47ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
48 : QMainWindow( parent, name, fl ) 48 : QMainWindow( parent, name, fl )
49{ 49{
50 setCaption(tr("ZSame")); 50 setCaption(tr("ZSame"));
51 51
52 setToolBarsMovable( false ); 52 setToolBarsMovable( false );
53 QToolBar* con = new QToolBar( this ); 53 QToolBar* con = new QToolBar( this );
54 con->setHorizontalStretchable( true ); 54 con->setHorizontalStretchable( true );
55 QMenuBar* mb = new QMenuBar( con ); 55 QMenuBar* mb = new QMenuBar( con );
56 QToolBar* tb = new QToolBar( this ); 56 QToolBar* tb = new QToolBar( this );
57 57
58 QPopupMenu* fileMenu = new QPopupMenu( this ); 58 QPopupMenu* fileMenu = new QPopupMenu( this );
59 59
60 QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") , 60 QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") ,
61 QString::null, 0, this, "new_icon"); 61 QString::null, 0, this, "new_icon");
62 a->addTo( fileMenu ); 62 a->addTo( fileMenu );
63 a->addTo( tb ); 63 a->addTo( tb );
64 connect(a, SIGNAL(activated()), this, SLOT(m_new())); 64 connect(a, SIGNAL(activated()), this, SLOT(m_new()));
65 65
66 a = new QAction(tr("Restart This Board"), Resource::loadIconSet("redo"), 66 a = new QAction(tr("Restart This Board"), Resource::loadIconSet("redo"),
67 QString::null, 0, this, "restart_board" ); 67 QString::null, 0, this, "restart_board" );
diff --git a/noncore/games/zsame/config.in b/noncore/games/zsame/config.in
index cd3e1a1..7774594 100644
--- a/noncore/games/zsame/config.in
+++ b/noncore/games/zsame/config.in
@@ -1,4 +1,4 @@
1 config ZSAME 1 config ZSAME
2 boolean "opie-zsame (a SameGame clone)" 2 boolean "opie-zsame (a SameGame clone)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/games/zsame/opie-zsame.control b/noncore/games/zsame/opie-zsame.control
index d9d5009..4a4b940 100644
--- a/noncore/games/zsame/opie-zsame.control
+++ b/noncore/games/zsame/opie-zsame.control
@@ -1,10 +1,10 @@
1Package: opie-zsame 1Package: opie-zsame
2Files: plugins/application/libzsame.so* bin/zsame apps/Games/zsame.desktop pics/zsame 2Files: plugins/application/libzsame.so* bin/zsame apps/Games/zsame.desktop pics/zsame
3Priority: optional 3Priority: optional
4Section: opie/games 4Section: opie/games
5Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org> 5Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: ZSame 8Description: ZSame
9 A game for the Opie environment. 9 A game for the Opie environment.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/zsame/zsame.pro b/noncore/games/zsame/zsame.pro
index 17fba91..ac1b5be 100644
--- a/noncore/games/zsame/zsame.pro
+++ b/noncore/games/zsame/zsame.pro
@@ -1,17 +1,17 @@
1CONFIG += qt warn_on quick-app 1CONFIG += qt warn_on quick-app
2 2
3 3
4TARGET = zsame 4TARGET = zsame
5 5
6HEADERS = StoneField.h StoneWidget.h ZSameWidget.h dropin/krandomsequence.h 6HEADERS = StoneField.h StoneWidget.h ZSameWidget.h dropin/krandomsequence.h
7SOURCES = StoneField.cpp StoneWidget.cpp ZSameWidget.cpp dropin/krandomsequence.cpp 7SOURCES = StoneField.cpp StoneWidget.cpp ZSameWidget.cpp dropin/krandomsequence.cpp
8 8
9 9
10INCLUDEPATH += $(OPIEDIR)/include dropin 10INCLUDEPATH += $(OPIEDIR)/include dropin
11DEPENDPATH += $(OPIEDIR)/include 11DEPENDPATH += $(OPIEDIR)/include
12 12
13 13
14# we now also include opie 14# we now also include opie
15LIBS += -lqpe 15LIBS += -lqpe -lopiecore2
16 16
17include ( $(OPIEDIR)/include.pro ) 17include ( $(OPIEDIR)/include.pro )