make the server a non gui application

this required a lot of reorganization:
- don't create ANY pixmaps. that requires QtGui
- don't create and QtWidgets
- thus SceneHolder is now a QGraphisScene itself
- and MainWidgets is a QWidget having SceneHolder as member variable

1 files changed, 11 insertions, 7 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 518692c..028bfad 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -7,19 +7,23 @@
 #include "pacman.pb.h"
 
 MainWidget::MainWidget(QWidget *parent)
-  : SceneHolder(parent), m_currentKey(Transmission::none), m_running(false)
+  : QWidget(parent), m_currentKey(Transmission::none), m_running(false)
 {
-  m_color = connectToServer();
-  if (m_color == Color::none)
+  Color::Color color = connectToServer();
+  if (color == Color::none)
   {
     QMessageBox::critical(this, "Error", "Failed to connect to server, falling back to local test mode");
     // TODO: quit application here or sth
     return;
   }
 
+  /* create our scene */
+  m_scene = new SceneHolder(this);
+  m_scene->setColor(color);
+
   /* call updateMap after m_color ist set! */
   createGui();
-  updateMap(Util::createDemoMap());
+  m_scene->updateMap(Util::createDemoMap());
 
   connect(m_socket, SIGNAL(readyRead()), this, SLOT(tick()));
 
@@ -27,7 +31,7 @@ MainWidget::MainWidget(QWidget *parent)
   connect(sendTimer, SIGNAL(timeout()), this, SLOT(sendKeyUpdate()));
   sendTimer->start(Constants::tick);
 
-  qDebug() << "mycolor=" << m_color;
+  qDebug() << "mycolor=" << m_scene->color();
 
   //TODO: play intro as soon as there are enough players
   //connect(AudioPlayer::self(), SIGNAL(finished()), this, SLOT(startGame()));
@@ -62,7 +66,7 @@ void MainWidget::createGui()
     playerLayout->addWidget(new QLabel("", this), 0, 1);
     playerLayout->addWidget(new QLabel("", this), 1, 1);
 
-    if (Color::order[i] == m_color)
+    if (Color::order[i] == m_scene->color())
       scoreLayout->insertWidget(0, scoreBox);
     else
       scoreLayout->addWidget(scoreBox);
@@ -145,7 +149,7 @@ void MainWidget::tick()
       ++i;
     }
   }
-  updateMap(map);
+  m_scene->updateMap(map);
   updateScore(packet);
 }