Merge from BRANCH_1_0

1 files changed, 4 insertions, 4 deletions

diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp
index b870a59..97a17a1 100644
--- a/noncore/games/buzzword/buzzword.cpp
+++ b/noncore/games/buzzword/buzzword.cpp
@@ -1,26 +1,26 @@
 /*
- * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch> 
+ * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License,Life or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qgrid.h>
 #include <qcolor.h>
 #include <qbutton.h>
 #include <qfile.h>
@@ -81,75 +81,75 @@ BuzzWord::BuzzWord() : QMainWindow(0)
         grid = NULL;
         gameOver = false;
         newGame();
 }
 
 void BuzzWord::drawGrid()
 {
         QStringList l;
 
         QString path = QPEApplication::qpeDir()+"share/buzzword/";
         QFile f( path + "buzzwords" );
         if ( !f.open( IO_ReadOnly ) )
                 return;
 
         QTextStream t( &f );
 
         while (!t.atEnd())
         {
                 l << t.readLine();
         }
 
         f.close();
 
         grid = new QGrid(gridVal, this);
-        grid->setFixedSize(240,240);
+        //grid->setFixedSize( 480, 480 );
 
         for( int c = 0 ; c < gridVal ; c++ )
         {
                 for( int r = 0 ; r < gridVal ; r++ )
                 {
                         uint pos = rand() % l. count();
-             
+
                         QString word = QStringList::split(" ", l[pos]).join("\n");
                         BuzzItem* bi = new BuzzItem( c, r, word, grid );
                         connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) );
                         map[c][r] = 0;
 
                         l.remove( l.at( pos ));
                 }
         }
 }
 
 void BuzzWord::clicked(int row, int column)
 {
         if ( ! gameOver )
         {
                 int rowTotal = 0;
                 int columnTotal = 0;
 
                 map[column][row] = 1;
-                
+
                 for( int c = 0 ; c < gridVal ; c++ )
                 {
                         for( int r = 0 ; r < gridVal ; r++ )
                         {
                                 if ( map[c][r] == 1 )
                                         rowTotal++;
 
                                 if ( rowTotal == 4 )
                                 {
                                         bingo();
                                 }
                         }
                         rowTotal = 0;
                 }
 
                 for( int r = 0 ; r < gridVal ; r++ )
                 {
                         for( int c = 0 ; c < gridVal ; c++ )
                         {
                                 if ( map[c][r] == 1 )
                                         columnTotal++;
 
                                 if ( columnTotal == 4 )
                                 {