| author | mickeyl <mickeyl> | 2003-11-03 23:05:29 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-03 23:05:29 (UTC) |
| commit | 8046118c7d4def83ef1a70628870b5ebad0534a4 (patch) (side-by-side diff) | |
| tree | 21f03403f1f4d42d72eace822511e084580a8772 /noncore/games/tictac | |
| parent | 7f34e7b45108c353e0a2575153904ce655cb1896 (diff) | |
| download | opie-8046118c7d4def83ef1a70628870b5ebad0534a4.zip opie-8046118c7d4def83ef1a70628870b5ebad0534a4.tar.gz opie-8046118c7d4def83ef1a70628870b5ebad0534a4.tar.bz2 | |
noncore/games/tictac now fully merged
| -rw-r--r-- | noncore/games/tictac/main.cpp | 6 | ||||
| -rw-r--r-- | noncore/games/tictac/tictac.cpp | 7 | ||||
| -rw-r--r-- | noncore/games/tictac/tictac.h | 7 | ||||
| -rw-r--r-- | noncore/games/tictac/tictac.pro | 9 |
4 files changed, 12 insertions, 17 deletions
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index 0185b8c..cfff683 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp @@ -1,8 +1,2 @@ /**************************************************************************** -<<<<<<< main.cpp -** $Id$ -======= -** $Id$ ->>>>>>> 1.1.8.1.2.1 -** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. diff --git a/noncore/games/tictac/tictac.cpp b/noncore/games/tictac/tictac.cpp index 3d727ac..4954ba4 100644 --- a/noncore/games/tictac/tictac.cpp +++ b/noncore/games/tictac/tictac.cpp @@ -1,3 +1,3 @@ /**************************************************************************** - ** $Id$ + ** tictac.cpp,v 1.3.8.1 2003/08/29 06:50:40 harlekin Exp ** @@ -290,4 +290,4 @@ void TicTacGameBoard::computerMove() -TicTacToe::TicTacToe( int boardSize, QWidget *parent, const char *name ) - : QWidget( parent, name ) +TicTacToe::TicTacToe( QWidget *parent, const char *name, WFlags fl ) + : QWidget( parent, name, fl ) { @@ -296,2 +296,3 @@ TicTacToe::TicTacToe( int boardSize, QWidget *parent, const char *name ) // Create a message label + boardSize = 3; diff --git a/noncore/games/tictac/tictac.h b/noncore/games/tictac/tictac.h index ec6c79c..bb0b485 100644 --- a/noncore/games/tictac/tictac.h +++ b/noncore/games/tictac/tictac.h @@ -1,3 +1,3 @@ /**************************************************************************** -** $Id$ +** tictac.h,v 1.1.10.1 2003/08/29 06:50:40 harlekin Exp ** @@ -93,3 +93,5 @@ class TicTacToe : public QWidget public: - TicTacToe( int boardSize=3, QWidget *parent=0, const char *name=0 ); + TicTacToe( QWidget *parent=0, const char *name=0, WFlags fl = 0 ); + static QString appName() { return QString::fromLatin1("tictac"); } + private slots: @@ -104,2 +106,3 @@ private: TicTacGameBoard *board; + int boardSize; }; diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro index eb0705e..5cbdbdc 100644 --- a/noncore/games/tictac/tictac.pro +++ b/noncore/games/tictac/tictac.pro @@ -1,3 +1,2 @@ -TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release quick-app HEADERS = tictac.h @@ -5,3 +4,2 @@ SOURCES = main.cpp \ tictac.cpp -TARGET = tictac INCLUDEPATH += $(OPIEDIR)/include @@ -9,3 +7,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -DESTDIR = $(OPIEDIR)/bin + +TARGET = tictac @@ -29,4 +28,2 @@ TRANSLATIONS = ../../../i18n/de/tictac.ts \ - - include ( $(OPIEDIR)/include.pro ) |