Compiles again

Fixed problems caused by merging some commits from the harmattan branch.

diff --git a/seascene.cpp b/seascene.cpp
index ac2270f..857ef7f 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -649,9 +649,6 @@ void SeaScene::prepareForMenu(QGraphicsItem * pItem)
     int itemsPerRow = 3;
 
 
-
-    int itemsPerRow = 3;
-
     pItem->setParentItem(pPausetextItem_);
     pItem->setZValue(1000);
     pItem->setFlag(QGraphicsItem::ItemIsSelectable);
@@ -896,7 +893,7 @@ void SeaScene::createLevelCompletedItems()
     pTapForNextLevelItem->setZValue(1000);
     pTapForNextLevelItem->setHtml("<font size=\"5\" color = darkorange>Tap to start the next level");
 
-
+}
 void SeaScene::createSelectLevelsetFromListItems()
 {
     if (availableLevelsets_.isEmpty()) //Something is badly wrong in code if this is true...

diff --git a/seascene.h b/seascene.h
index 3b3f0f8..963f3d1 100644 (file)
--- a/seascene.h
+++ b/seascene.h
@@ -145,7 +145,6 @@ protected:
     QGraphicsTextItem * pVictoryCongratulationsItem_;
     QGraphicsTextItem * pVictoryScoreItem_;
     QGraphicsTextItem * pAboutBoxItem_;
-    QGraphicsTextItem * pVictoryCongratulationsItem_;
 
     QGraphicsTextItem * pLevelCompletedItem_;