| -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,10 +1,4 @@ /**************************************************************************** -<<<<<<< main.cpp -** $Id$ -======= -** $Id$ ->>>>>>> 1.1.8.1.2.1 -** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example 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,5 +1,5 @@ /**************************************************************************** - ** $Id$ + ** tictac.cpp,v 1.3.8.1 2003/08/29 06:50:40 harlekin Exp ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** @@ -288,12 +288,13 @@ void TicTacGameBoard::computerMove() // signals of child widgets to slots. // -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 ) { QVBoxLayout * l = new QVBoxLayout( this, 6 ); // Create a message label + boardSize = 3; message = new QLabel( this ); message->setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); 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,5 +1,5 @@ /**************************************************************************** -** $Id$ +** tictac.h,v 1.1.10.1 2003/08/29 06:50:40 harlekin Exp ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** @@ -91,7 +91,9 @@ class TicTacToe : public QWidget { Q_OBJECT 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: void newGameClicked(); void gameOver(); @@ -102,6 +104,7 @@ private: QPushButton *quit; QLabel *message; 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,13 +1,12 @@ -TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release quick-app HEADERS = tictac.h SOURCES = main.cpp \ tictac.cpp -TARGET = tictac INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -DESTDIR = $(OPIEDIR)/bin + +TARGET = tictac TRANSLATIONS = ../../../i18n/de/tictac.ts \ ../../../i18n/nl/tictac.ts \ @@ -27,6 +26,4 @@ TRANSLATIONS = ../../../i18n/de/tictac.ts \ ../../../i18n/zh_CN/tictac.ts \ ../../../i18n/zh_TW/tictac.ts - - include ( $(OPIEDIR)/include.pro ) |