summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/tictac/main.cpp6
-rw-r--r--noncore/games/tictac/tictac.cpp7
-rw-r--r--noncore/games/tictac/tictac.h7
-rw-r--r--noncore/games/tictac/tictac.pro9
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 @@
1/**************************************************************************** 1/****************************************************************************
2<<<<<<< main.cpp
3** $Id$
4=======
5** $Id$
6>>>>>>> 1.1.8.1.2.1
7**
8** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. 2** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
9** 3**
10** This file is part of an example program for Qt. This example 4** 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 @@
1/**************************************************************************** 1/****************************************************************************
2 ** $Id$ 2 ** tictac.cpp,v 1.3.8.1 2003/08/29 06:50:40 harlekin Exp
3 ** 3 **
4 ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. 4 ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
5 ** 5 **
@@ -288,12 +288,13 @@ void TicTacGameBoard::computerMove()
288// signals of child widgets to slots. 288// signals of child widgets to slots.
289// 289//
290 290
291TicTacToe::TicTacToe( int boardSize, QWidget *parent, const char *name ) 291TicTacToe::TicTacToe( QWidget *parent, const char *name, WFlags fl )
292 : QWidget( parent, name ) 292 : QWidget( parent, name, fl )
293{ 293{
294 QVBoxLayout * l = new QVBoxLayout( this, 6 ); 294 QVBoxLayout * l = new QVBoxLayout( this, 6 );
295 295
296 // Create a message label 296 // Create a message label
297 boardSize = 3;
297 298
298 message = new QLabel( this ); 299 message = new QLabel( this );
299 message->setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); 300 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 @@
1/**************************************************************************** 1/****************************************************************************
2** $Id$ 2** tictac.h,v 1.1.10.1 2003/08/29 06:50:40 harlekin Exp
3** 3**
4** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. 4** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
5** 5**
@@ -91,7 +91,9 @@ class TicTacToe : public QWidget
91{ 91{
92 Q_OBJECT 92 Q_OBJECT
93public: 93public:
94 TicTacToe( int boardSize=3, QWidget *parent=0, const char *name=0 ); 94 TicTacToe( QWidget *parent=0, const char *name=0, WFlags fl = 0 );
95 static QString appName() { return QString::fromLatin1("tictac"); }
96
95private slots: 97private slots:
96 voidnewGameClicked(); 98 voidnewGameClicked();
97 voidgameOver(); 99 voidgameOver();
@@ -102,6 +104,7 @@ private:
102 QPushButton *quit; 104 QPushButton *quit;
103 QLabel*message; 105 QLabel*message;
104 TicTacGameBoard *board; 106 TicTacGameBoard *board;
107 int boardSize;
105}; 108};
106 109
107 110
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 @@
1TEMPLATE = app 1CONFIG += qt warn_on release quick-app
2CONFIG += qt warn_on release
3HEADERS = tictac.h 2HEADERS = tictac.h
4SOURCES = main.cpp \ 3SOURCES = main.cpp \
5 tictac.cpp 4 tictac.cpp
6TARGET = tictac
7INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 7LIBS += -lqpe
10DESTDIR = $(OPIEDIR)/bin 8
9 TARGET = tictac
11 10
12TRANSLATIONS = ../../../i18n/de/tictac.ts \ 11TRANSLATIONS = ../../../i18n/de/tictac.ts \
13 ../../../i18n/nl/tictac.ts \ 12 ../../../i18n/nl/tictac.ts \
@@ -27,6 +26,4 @@ TRANSLATIONS = ../../../i18n/de/tictac.ts \
27 ../../../i18n/zh_CN/tictac.ts \ 26 ../../../i18n/zh_CN/tictac.ts \
28 ../../../i18n/zh_TW/tictac.ts 27 ../../../i18n/zh_TW/tictac.ts
29 28
30
31
32include ( $(OPIEDIR)/include.pro ) 29include ( $(OPIEDIR)/include.pro )