Backing out unintentional merge from TT branch.

1 files changed, 5 insertions, 1 deletions

diff --git a/noncore/games/wordgame/wordgame.h b/noncore/games/wordgame/wordgame.h
index 0ffa56a..f73c85a 100644
--- a/noncore/games/wordgame/wordgame.h
+++ b/noncore/games/wordgame/wordgame.h
@@ -145,12 +145,14 @@ public:
 
     void setPlayerName(const QString& name) { nm = name; }
     QString playerName() const { return nm; }
     void setComputerization(int level) { cpu=level; }
     bool computerized() const { return cpu>0; }
 
+    QSize sizeHint() const;
+
 protected:
     void resizeEvent(QResizeEvent*e);
     void contentsMousePressEvent(QMouseEvent*);
     void contentsMouseMoveEvent(QMouseEvent*);
     void contentsMouseReleaseEvent(QMouseEvent*);
 
@@ -208,12 +210,14 @@ public:
         const QPoint& d, bool ignoredict, QStringList* words) const;
     int bonussedValue(const QPoint& at, int base, int& all_mult) const;
     bool isStart(const QPoint& at) const;
 
     int turnScore() const { return turn_score; }
 
+    QSize sizeHint() const;
+
 signals:
     void temporaryScore(int);
 
 protected:
     void contentsMousePressEvent(QMouseEvent*);
     void contentsMouseMoveEvent(QMouseEvent*);
@@ -328,13 +332,13 @@ private:
     bool refillRack(int i);
     void readyRack(int i);
     Rack* rack(int i) const;
 
     QWidgetStack *racks;
     QToolBar* toolbar;
-    QVBox *vbox;
+    QWidget *vbox;
     Board *board;
     Bag *bag;
     ScoreInfo *scoreinfo;
     QToolButton *done;
     QToolButton *reset;
     QTimer* aiheart;