all up-to-date and merged

demmerichs · Mar 3, 2014 · 40acae4 · 40acae4
1 parent 8a45346
commit 40acae4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 30 deletions.
diff --git a/userinterface/header/spielbrett.h b/userinterface/header/spielbrett.h
@@ -3,13 +3,8 @@
 
 #include <QWidget>
 #include <QColor>
-<<<<<<< HEAD
 #include "../../game/header/Constants.h"
 #include "../../game/header/State.h"
-=======
-#include "Konstant.h"
-#include "State.h"
->>>>>>> refs/remotes/origin/master
 #include "window.h"
 
 class Window;
@@ -18,7 +13,7 @@ class Spielbrett: public QWidget
 {
   Q_OBJECT
 public:
-  Spielbrett(Window* parentalWindow, QWidget* parent = 0);
+  Spielbrett(Window* parentalWindow);
   //QSize minimumSizeHint ()const;
   //QSize sizeHint ()const;
 

diff --git a/userinterface/header/uiexec.h b/userinterface/header/uiexec.h
@@ -1,38 +1,18 @@
 #ifndef UIEXEC_H
 #define UIEXEC_H
 #include "window.h"
-<<<<<<< HEAD
 #include "../../game/header/Constants.h"
 #include "../../game/header/Board.h"
 #include "../../logger/header/SimulationLogger.h"
 #include <QString>
 
 class UIEXEC {
-
 public:
 	UIEXEC();
 	Window* wp;
 	Board* board;
 	SimulationLogger* simulation;
 	void doTheMagic();
-=======
-#include"Konstant.h"
-#include"Brett.h"
-#include"Game.h"
-#include <QString>
-
-
-class UIEXEC
-{
-
-public:
-  UIEXEC();
-  Window* wp;
-  Brett* board;
-  Game* game1;
-  void doTheMagic();
->>>>>>> refs/remotes/origin/master
-
 };
 
 #endif // UIEXEC_H
diff --git a/userinterface/header/window.h b/userinterface/header/window.h
@@ -47,6 +47,7 @@ Q_OBJECT
 	QLabel* player5;
 	QLabel* player6;
 	QLabel* toolBoxLabel;
+	QPushButton* newGameButton;
 	QSpinBox* vektorSpinBox;
 	QCheckBox* showTownsCheckBox;
 	QLCDNumber* counterLCD;

diff --git a/userinterface/source/mainwindow.cpp b/userinterface/source/mainwindow.cpp
@@ -1,9 +1,10 @@
 #include "../header/mainwindow.h"
+#include "../header/window.h"
 
 MainWindow::MainWindow()
 {
- myGameExe = new UIEXEC;
-    wp = new Window(myGameExe->game1);
+	myGameExe = new UIEXEC;
+    wp = new Window(myGameExe->simulation);
     myGameExe->doTheMagic();
     setCentralWidget(wp);
     myToolBar = addToolBar(tr("Test"));

diff --git a/userinterface/source/spielbrett.cpp b/userinterface/source/spielbrett.cpp
@@ -44,7 +44,7 @@ QPixmap getPixmap(CITYCOLOUR i) {
 		return QPixmap(" ");
 }
 
-Spielbrett::Spielbrett(Window* parentalWindow, QWidget* parent) :
+Spielbrett::Spielbrett(Window* parentalWindow) :
 		parentalWindow(parentalWindow) {
 
 	drawCity = false;

diff --git a/userinterface/source/window.cpp b/userinterface/source/window.cpp
@@ -24,7 +24,7 @@ Window::Window(SimulationLogger *game) :
 	vektorSpinBox = new QSpinBox;
 	showTownsCheckBox = new QCheckBox;
     newGameButton = new QPushButton(tr("New Game"));
-	vektorSpinBox->setRange(0, gamep->zustandsListe.size());
+	vektorSpinBox->setRange(0, simulationp->gameList[0]->roundList[0]->moveList.size());
 	vektorSpinBox->setWrapping(false);
 	vektorSpinBox->setSuffix(tr(". Zustand"));
 	counterLCD = new QLCDNumber;