From: Constantin Date: Thu, 25 Jul 2013 12:43:44 +0000 (+0200) Subject: more stuff from the schönen künste X-Git-Url: https://git.ralfj.de/multypo.git/commitdiff_plain/9c1e7f79952d5e4f6c8c38bb71e1c7c4dc6a3d01?ds=sidebyside more stuff from the schönen künste --- diff --git a/play.sh b/play.sh index 6c3b185..288dbcf 100755 --- a/play.sh +++ b/play.sh @@ -4,5 +4,5 @@ WORDSTOPLAY=10 -sort -R dict.txt | egrep '^[A-Za-z]{5,}$' | head -n $WORDSTOPLAY | tr [:upper:] [:lower:] | qt/multypo +sort -R dict.txt | sed 's/\/.*//' | egrep '^[A-Za-z]{5,}$' | head -n $WORDSTOPLAY | tr [:upper:] [:lower:] | qt/multypo diff --git a/qt/player.cpp b/qt/player.cpp index 937bbab..69e7651 100644 --- a/qt/player.cpp +++ b/qt/player.cpp @@ -10,7 +10,7 @@ static QString colorToString(QColor col) .arg(col.blue(), 2, 16, QChar('0')); } -Player::Player(QWidget* parent) { +Player::Player(QWidget* parent) : score(0) { theLabel = new QLabel (parent); parent->layout()->addWidget(theLabel); modifyable = true; diff --git a/qt/player.h b/qt/player.h index c74413c..0facdd5 100644 --- a/qt/player.h +++ b/qt/player.h @@ -18,8 +18,9 @@ public: bool hasName(); QString getName(); QString getCurrentLine(); - int score; void setWaiting(QString labeltext); + + int score; }; #endif // PLAYER_H