Merge branch 'master' of ssh://manuel.mausz.at/foop

Conflicts:
	pacman-c++/pacman.pro

1 files changed, 37 insertions, 0 deletions

diff --git a/pacman-c++/sceneholder.h b/pacman-c++/sceneholder.h
new file mode 100644
index 0000000..d69e07e
--- /dev/null
+++ b/pacman-c++/sceneholder.h
@@ -0,0 +1,37 @@
+#ifndef SCENEHOLDER_H
+#define SCENEHOLDER_H
+
+#include <QtGui>
+
+#include "constants.h"
+
+class PixmapItem;
+class Actor;
+
+class SceneHolder
+  : public QWidget
+{
+  Q_OBJECT
+
+public:
+  SceneHolder(QWidget* parent = 0);
+  virtual ~SceneHolder() {};
+
+protected:
+
+  virtual void updateMap(const Transmission::map_t& map);
+
+  // data conversion
+  QPoint mapPositionToCoord(unsigned int x, unsigned int y);
+
+  // map of all pixmap instances
+  QVector< QVector<PixmapItem *> > visualMap;
+
+  // map of actors in order to keep track of those instances
+  QMap<Color::Color, Actor*> m_actors;
+
+  QGraphicsScene *m_scene;
+
+};
+
+#endif // SCENEHOLDER_H
\ No newline at end of file