summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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,99 +1,99 @@
/* Yo Emacs, this is -*- C++ -*- */
/*
* ksame 0.4 - simple Game
* Copyright (C) 1997,1998 Marcus Kreutzberger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
#include <stdio.h>
+#include <opie2/oapplicationfactory.h>
+
+#include <qpe/resource.h>
+
#include <qtoolbar.h>
#include <qmenubar.h>
-
#include <qapplication.h>
#include <qaction.h>
#include <qmessagebox.h>
-#include <qpe/resource.h>
-#include <opie/oapplicationfactory.h>
#include <kapplication.h>
-
#include "ZSameWidget.h"
static int default_colors=3;
#define i18n tr
OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> )
ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
: QMainWindow( parent, name, fl )
{
setCaption(tr("ZSame"));
setToolBarsMovable( false );
QToolBar* con = new QToolBar( this );
con->setHorizontalStretchable( true );
QMenuBar* mb = new QMenuBar( con );
QToolBar* tb = new QToolBar( this );
QPopupMenu* fileMenu = new QPopupMenu( this );
QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") ,
QString::null, 0, this, "new_icon");
a->addTo( fileMenu );
a->addTo( tb );
connect(a, SIGNAL(activated()), this, SLOT(m_new()));
a = new QAction(tr("Restart This Board"), Resource::loadIconSet("redo"),
QString::null, 0, this, "restart_board" );
a->addTo( fileMenu );
connect( a, SIGNAL(activated()), this, SLOT(m_restart()));
restart = a;
a = new QAction( tr("Undo"), Resource::loadIconSet("undo"),
QString::null, 0, this, "undo_action" );
a->addTo( fileMenu );
a->addTo( tb );
connect( a, SIGNAL(activated()), this, SLOT(m_undo()));
a = new QAction(tr("Quit"), Resource::loadIconSet("quit_icon"),
QString::null, 0, this, "quit_action");
a->addTo( fileMenu );
a->addTo( tb );
connect(a, SIGNAL(activated()), this, SLOT(m_quit()));
mb->insertItem(tr("Game" ), fileMenu );
int foo[2];
desktop_widget(foo);
stone = new StoneWidget(this,foo[0],foo[1]);
connect( stone, SIGNAL(s_gameover()), this, SLOT(gameover()));
connect( stone, SIGNAL(s_colors(int)), this, SLOT(setColors(int)));
connect( stone, SIGNAL(s_board(int)), this, SLOT(setBoard(int)));
connect( stone, SIGNAL(s_marked(int)), this, SLOT(setMarked(int)));
connect( stone, SIGNAL(s_score(int)), this, SLOT(setScore(int)));
connect( stone, SIGNAL(s_remove(int,int)), this, SLOT(stonesRemoved(int,int)));
connect(stone, SIGNAL(s_sizechanged()), this, SLOT(sizeChanged()));
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 @@
config ZSAME
boolean "opie-zsame (a SameGame clone)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 )
+ 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 @@
Package: opie-zsame
Files: plugins/application/libzsame.so* bin/zsame apps/Games/zsame.desktop pics/zsame
Priority: optional
Section: opie/games
Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: ZSame
A game for the Opie environment.
Version: $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 @@
CONFIG += qt warn_on quick-app
TARGET = zsame
HEADERS = StoneField.h StoneWidget.h ZSameWidget.h dropin/krandomsequence.h
SOURCES = StoneField.cpp StoneWidget.cpp ZSameWidget.cpp dropin/krandomsequence.cpp
INCLUDEPATH += $(OPIEDIR)/include dropin
DEPENDPATH += $(OPIEDIR)/include
# we now also include opie
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
include ( $(OPIEDIR)/include.pro )