-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 @@ | |||
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. |
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 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** tictac.cpp,v 1.3.8.1 2003/08/29 06:50:40 harlekin Exp |
3 | ** | 3 | ** |
@@ -290,4 +290,4 @@ void TicTacGameBoard::computerMove() | |||
290 | 290 | ||
291 | TicTacToe::TicTacToe( int boardSize, QWidget *parent, const char *name ) | 291 | TicTacToe::TicTacToe( QWidget *parent, const char *name, WFlags fl ) |
292 | : QWidget( parent, name ) | 292 | : QWidget( parent, name, fl ) |
293 | { | 293 | { |
@@ -296,2 +296,3 @@ TicTacToe::TicTacToe( int boardSize, QWidget *parent, const char *name ) | |||
296 | // Create a message label | 296 | // Create a message label |
297 | boardSize = 3; | ||
297 | 298 | ||
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 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** tictac.h,v 1.1.10.1 2003/08/29 06:50:40 harlekin Exp |
3 | ** | 3 | ** |
@@ -93,3 +93,5 @@ class TicTacToe : public QWidget | |||
93 | public: | 93 | public: |
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 | |||
95 | private slots: | 97 | private slots: |
@@ -104,2 +106,3 @@ private: | |||
104 | TicTacGameBoard *board; | 106 | TicTacGameBoard *board; |
107 | int boardSize; | ||
105 | }; | 108 | }; |
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 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | HEADERS = tictac.h | 2 | HEADERS = tictac.h |
@@ -5,3 +4,2 @@ SOURCES = main.cpp \ | |||
5 | tictac.cpp | 4 | tictac.cpp |
6 | TARGET = tictac | ||
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
@@ -9,3 +7,4 @@ DEPENDPATH += $(OPIEDIR)/include | |||
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | DESTDIR = $(OPIEDIR)/bin | 8 | |
9 | TARGET = tictac | ||
11 | 10 | ||
@@ -29,4 +28,2 @@ TRANSLATIONS = ../../../i18n/de/tictac.ts \ | |||
29 | 28 | ||
30 | |||
31 | |||
32 | include ( $(OPIEDIR)/include.pro ) | 29 | include ( $(OPIEDIR)/include.pro ) |