summaryrefslogtreecommitdiff
authorimm <imm>2002-08-30 22:03:20 (UTC)
committer imm <imm>2002-08-30 22:03:20 (UTC)
commitc3fbc3f07c4deb54a3c5efd7cd91beaba875d57c (patch) (unidiff)
treec08b80f938953dff0a25798bae77b623b9024932
parent8c26b7fe6b3afc8c3de2ee48bfb50bb041dadede (diff)
downloadopie-c3fbc3f07c4deb54a3c5efd7cd91beaba875d57c.zip
opie-c3fbc3f07c4deb54a3c5efd7cd91beaba875d57c.tar.gz
opie-c3fbc3f07c4deb54a3c5efd7cd91beaba875d57c.tar.bz2
fix by sandman
STL -> qt
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/buzzword/buzzword.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp
index 447396b..324b5bd 100644
--- a/noncore/games/buzzword/buzzword.cpp
+++ b/noncore/games/buzzword/buzzword.cpp
@@ -32,19 +32,10 @@
32#include <math.h> 32#include <math.h>
33#include <stdlib.h> 33#include <stdlib.h>
34 34
35#include <list>
36#include <string>
37
38#include <qpe/qpeapplication.h> 35#include <qpe/qpeapplication.h>
39 36
40#include "buzzword.h" 37#include "buzzword.h"
41 38
42// sponsered by rikkus :)
43bool random_compare(const QString &, const QString &)
44{
45 return (rand() % 2) > 0.5;
46}
47
48BuzzLabel::BuzzLabel( QWidget *parent, const char *name ) 39BuzzLabel::BuzzLabel( QWidget *parent, const char *name )
49: QLabel( parent, name ) 40: QLabel( parent, name )
50{ 41{
@@ -96,7 +87,7 @@ BuzzWord::BuzzWord() : QMainWindow(0)
96 87
97void BuzzWord::drawGrid() 88void BuzzWord::drawGrid()
98{ 89{
99 std::list<QString> l; 90 QStringList l;
100 91
101 QString path = QPEApplication::qpeDir()+"share/buzzword/"; 92 QString path = QPEApplication::qpeDir()+"share/buzzword/";
102 QFile f( path + "buzzwords" ); 93 QFile f( path + "buzzwords" );
@@ -107,13 +98,11 @@ void BuzzWord::drawGrid()
107 98
108 while (!t.atEnd()) 99 while (!t.atEnd())
109 { 100 {
110 l.push_back(t.readLine()); 101 l << t.readLine();
111 } 102 }
112 103
113 f.close(); 104 f.close();
114 105
115 l.sort(random_compare);
116
117 grid = new QGrid(gridVal, this); 106 grid = new QGrid(gridVal, this);
118 grid->setFixedSize(240,240); 107 grid->setFixedSize(240,240);
119 108
@@ -121,12 +110,14 @@ void BuzzWord::drawGrid()
121 { 110 {
122 for( int r = 0 ; r < gridVal ; r++ ) 111 for( int r = 0 ; r < gridVal ; r++ )
123 { 112 {
124 QString word = QStringList::split(" ", l.front()).join("\n"); 113 uint pos = rand() % l. count();
114
115 QString word = QStringList::split(" ", l[pos]).join("\n");
125 BuzzItem* bi = new BuzzItem( c, r, word, grid ); 116 BuzzItem* bi = new BuzzItem( c, r, word, grid );
126 connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) ); 117 connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) );
127 map[c][r] = 0; 118 map[c][r] = 0;
128 119
129 l.pop_front(); 120 l.remove( l.at( pos ));
130 } 121 }
131 } 122 }
132} 123}