summaryrefslogtreecommitdiff
path: root/noncore/games/wordgame/wordgame.h
authorkergoth <kergoth>2002-06-07 18:53:14 (UTC)
committer kergoth <kergoth>2002-06-07 18:53:14 (UTC)
commit640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (side-by-side diff)
tree9a784686c1795f8b1f81eb344598f3b549d43467 /noncore/games/wordgame/wordgame.h
parentdfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff)
downloadopie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip
opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz
opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2
Backing out unintentional merge from TT branch.
Diffstat (limited to 'noncore/games/wordgame/wordgame.h') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/wordgame/wordgame.h6
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
@@ -150,2 +150,4 @@ public:
+ QSize sizeHint() const;
+
protected:
@@ -213,2 +215,4 @@ public:
+ QSize sizeHint() const;
+
signals:
@@ -333,3 +337,3 @@ private:
QToolBar* toolbar;
- QVBox *vbox;
+ QWidget *vbox;
Board *board;