summaryrefslogtreecommitdiff
path: root/examples/script/qstetrix/tetrixboard.h
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-25 15:52:04 +0100
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-25 15:53:02 +0100
commitdfbabeca0cb8a9efdb6758c228700eeb5996652c (patch)
tree42598fd46dbde25acb47953d3f75799ccfd2e4ea /examples/script/qstetrix/tetrixboard.h
parent1e6c23469ea78f6ff5a3a546c08ae22a5ba79356 (diff)
downloadqt4-tools-dfbabeca0cb8a9efdb6758c228700eeb5996652c.tar.gz
Fix warnings and build on mingw
Diffstat (limited to 'examples/script/qstetrix/tetrixboard.h')
-rw-r--r--examples/script/qstetrix/tetrixboard.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/examples/script/qstetrix/tetrixboard.h b/examples/script/qstetrix/tetrixboard.h
index 7a04317b10..781ec395a0 100644
--- a/examples/script/qstetrix/tetrixboard.h
+++ b/examples/script/qstetrix/tetrixboard.h
@@ -45,21 +45,19 @@
#include <QTimer>
#include <QFrame>
#include <QPointer>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-QT_END_NAMESPACE
+#include <QLabel>
class TetrixBoard : public QFrame
{
Q_OBJECT
Q_PROPERTY(QObject* timer READ getTimer)
- Q_PROPERTY(QWidget* nextPieceLabel WRITE setNextPieceLabel)
+ Q_PROPERTY(QWidget* nextPieceLabel READ nextPieceLabel WRITE setNextPieceLabel)
public:
TetrixBoard(QWidget *parent = 0);
void setNextPieceLabel(QWidget *label);
+ QLabel *nextPieceLabel() const;
void setBoardWidth(int width);
void setBoardHeight(int height);
QSize minimumSizeHint() const;
@@ -95,7 +93,7 @@ private:
int squareHeight() { return contentsRect().height() / BoardHeight; }
QTimer *timer;
- QPointer<QLabel> nextPieceLabel;
+ QPointer<QLabel> nextPieceLbl;
QImage image;
};