Fix warnings and build on mingw

2 files changed, 13 insertions, 10 deletions

diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp
index 7d44c4c..f35740d 100644
--- a/examples/script/qstetrix/tetrixboard.cpp
+++ b/examples/script/qstetrix/tetrixboard.cpp
@@ -54,7 +54,12 @@ TetrixBoard::TetrixBoard(QWidget *parent)
 
 void TetrixBoard::setNextPieceLabel(QWidget *label)
 {
-    nextPieceLabel = qobject_cast<QLabel*>(label);
+    nextPieceLbl = qobject_cast<QLabel*>(label);
+}
+
+QLabel *TetrixBoard::nextPieceLabel() const
+{ 
+    return nextPieceLbl;
 }
 
 QObject *TetrixBoard::getTimer()
@@ -82,16 +87,16 @@ void TetrixBoard::keyPressEvent(QKeyEvent *event)
 
 void TetrixBoard::showNextPiece(int width, int height)
 {
-    if (!nextPieceLabel)
+    if (!nextPieceLabel())
         return;
 
     QPixmap pixmap(width * squareWidth(), height * squareHeight());
     QPainter painter(&pixmap);
-    painter.fillRect(pixmap.rect(), nextPieceLabel->palette().background());
+    painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().background());
 
     emit paintNextPieceRequested(&painter);
 
-    nextPieceLabel->setPixmap(pixmap);
+    nextPieceLabel()->setPixmap(pixmap);
 }
 
 void TetrixBoard::drawPauseScreen(QPainter *painter)
diff --git a/examples/script/qstetrix/tetrixboard.h b/examples/script/qstetrix/tetrixboard.h
index 7a04317..781ec39 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;
 };