Merge branch 'levelstructure'

Conflicts:
	mainwindow.cpp

Multiple levels now supported. 5 levels now.
"Restart game" added to the menu.

diff --cc ghostsoverboard.pro
Simple merge

diff --cc mainwindow.cpp
index 4191aca,0621f7d..0845aa7
--- 1/mainwindow.cpp
--- 2/mainwindow.cpp
+++ b/mainwindow.cpp
@@@ -71,8 -65,24 +71,25 @@@ MainWindow::MainWindow(QWidget *parent
      connect(pAboutAction,SIGNAL(triggered()),this,SLOT(about()));
      menuBar()->addAction(pAboutAction);
  
+     QAction * pRestartGameAction = new QAction(tr("Restart game"),this);
+     addAction(pRestartGameAction);
+     connect(pRestartGameAction,SIGNAL(triggered()),this,SLOT(restartGame()));
+     menuBar()->addAction(pRestartGameAction);
+ 
+     Level level1(5,10);
+     levelList_.append(level1);
+     Level level2(5,10,2,50);
+     levelList_.append(level2);
+     Level level3(5,15,3,50);
+     levelList_.append(level3);
+     Level level4(5,15,5,50);
+     levelList_.append(level4);
+     Level level5(5,15,5,100);
+     levelList_.append(level5);
+ 
+     currentLevel_ = 0;
  
 +
      //the boundaries of the scene are set to match the size of the view window, which is not
      //available in the constructor --> timer needed
      QTimer::singleShot(100,this,SLOT(initializeBoundaries()));

diff --cc mainwindow.h
index 3d4d5fa,31438ed..91be672
--- 1/mainwindow.h
--- 2/mainwindow.h
+++ b/mainwindow.h
@@@ -44,17 -44,17 +44,19 @@@ public slots
      void restartLevel();
      void about();
      void nextLevel();
+     void restartGame();
  
  
 +
  private:
  
  SeaScene * pScene_;
  QGraphicsView * pView_;
  QAction* pPauseAction_;
- 
+ QList<Level> levelList_;
+ int currentLevel_;
  
 +
  };
  
  #endif // MAINWINDOW_H

diff --cc seascene.cpp
Simple merge

diff --cc seascene.h
Simple merge