[Camino-devel] camino/src/client BoardCanvas.h BoardCanvas.cpp

[Pascal Audoux]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Pascal Audoux <address@hidden>  03/03/04 15:56:34

Modified files:
        src/client     : BoardCanvas.h BoardCanvas.cpp 

Log message:
        as Camino::nbVerTiles and Camino::nbHorTiles have been renamed, we have 
to change
        these files too...

Patches:
Index: camino/src/client/BoardCanvas.cpp
diff -u camino/src/client/BoardCanvas.cpp:1.10 
camino/src/client/BoardCanvas.cpp:1.11
--- camino/src/client/BoardCanvas.cpp:1.10      Sun Mar  2 17:42:41 2003
+++ camino/src/client/BoardCanvas.cpp   Tue Mar  4 15:56:31 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: BoardCanvas.cpp,v 1.10 2003/03/02 22:42:41 Audoux Exp $
+** Version : $Id: BoardCanvas.cpp,v 1.11 2003/03/04 20:56:31 Audoux Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 22/01/2003
@@ -37,12 +37,12 @@
        : QCanvas( parent, name )
 {
        _margin = 2;
-       resize( (Theme::getTheme()->getTileSize() * Camino::nbHorTiles) + ( 2 * 
_margin ),
-                       (Theme::getTheme()->getTileSize() * Camino::nbVerTiles) 
+ ( 2 * _margin ) );
+       resize( (Theme::getTheme()->getTileSize() * Camino::nbCol) + ( 2 * 
_margin ),
+                       (Theme::getTheme()->getTileSize() * Camino::nbRow) + ( 
2 * _margin ) );
        setBackgroundColor( Qt::black );
 
-       for( int i = 0; i < Camino::nbVerTiles; i++ ) {
-               for( int j = 0; j < Camino::nbHorTiles; j++ ) {
+       for( int i = 0; i < Camino::nbRow; i++ ) {
+               for( int j = 0; j < Camino::nbCol; j++ ) {
                        _board[i][j] = new TileSprite( this, i, j );
                }
        }
@@ -50,8 +50,8 @@
 
 BoardCanvas::~BoardCanvas()
 {
-       for( int i = 0; i < Camino::nbVerTiles; i++ ) {
-               for( int j = 0; j < Camino::nbHorTiles; j++ ) {
+       for( int i = 0; i < Camino::nbRow; i++ ) {
+               for( int j = 0; j < Camino::nbCol; j++ ) {
                        delete _board[i][j];
                        _board[i][j] = 0;
                }
@@ -78,8 +78,8 @@
 
 void BoardCanvas::clear()
 {
-       for( int i = 0; i < Camino::nbVerTiles; i++ ) {
-               for( int j = 0; j < Camino::nbHorTiles; j++ ) {
+       for( int i = 0; i < Camino::nbRow; i++ ) {
+               for( int j = 0; j < Camino::nbCol; j++ ) {
                        _board[i][j]->cancelRotation();
                        _board[i][j]->setType( Tile::TILE_UNKNOWN );
                }
@@ -88,8 +88,8 @@
 
 void BoardCanvas::reupdate()
 {
-       resize( (Theme::getTheme()->getTileSize() * Camino::nbHorTiles) + ( 2 * 
_margin ),
-               (Theme::getTheme()->getTileSize() * Camino::nbVerTiles) + ( 2 * 
_margin ) );
+       resize( (Theme::getTheme()->getTileSize() * Camino::nbCol) + ( 2 * 
_margin ),
+               (Theme::getTheme()->getTileSize() * Camino::nbRow) + ( 2 * 
_margin ) );
 
 }
 
@@ -100,8 +100,8 @@
        int tileSize = Theme::getTheme()->getTileSize();
        p.fillRect( rect(), QBrush( black ) );
        p.setPen( color );
-       for (col=0; col < Camino::nbHorTiles; col++ ) {
-               for (row=0; row < Camino::nbVerTiles; row++ ) {
+       for (col=0; col < Camino::nbCol; col++ ) {
+               for (row=0; row < Camino::nbRow; row++ ) {
                        rowCol2xy( row, col, &x, &y );
                        p.drawRect( x, y, tileSize, tileSize );
                }
Index: camino/src/client/BoardCanvas.h
diff -u camino/src/client/BoardCanvas.h:1.6 camino/src/client/BoardCanvas.h:1.7
--- camino/src/client/BoardCanvas.h:1.6 Sun Mar  2 16:26:21 2003
+++ camino/src/client/BoardCanvas.h     Tue Mar  4 15:56:31 2003
@@ -5,7 +5,7 @@
 ** BoardCanvas.h
 ** Canvas for the board view
 **
-** Version : $Id: BoardCanvas.h,v 1.6 2003/03/02 21:26:21 Audoux Exp $
+** Version : $Id: BoardCanvas.h,v 1.7 2003/03/04 20:56:31 Audoux Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 22/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -69,7 +69,7 @@
        virtual void drawBackground ( QPainter & painter, const QRect & clip );
 
        int _margin;
-       TileSprite * _board[Camino::nbVerTiles][Camino::nbHorTiles];
+       TileSprite * _board[Camino::nbRow][Camino::nbCol];
 
 friend class BoardView;
 };