From 5035ea3e5616578fc406998e7850c55e5f4d13a6 Mon Sep 17 00:00:00 2001
From: totycro <totycro@unknown-horizons.org>
Date: Wed, 6 Apr 2011 15:25:58 +0200
Subject: merge

---
 pacman-c++/mainwidget.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pacman-c++/mainwidget.h')

diff --git a/pacman-c++/mainwidget.h b/pacman-c++/mainwidget.h
index 0056669..36e5624 100644
--- a/pacman-c++/mainwidget.h
+++ b/pacman-c++/mainwidget.h
@@ -1,10 +1,12 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
-#include "constants.h"
 #include <QtGui>
 #include <QtCore>
 
+#include "constants.h"
+#include "pixmapitem.h"
+
 class Actor;
 
 class MainWidget
@@ -22,12 +24,12 @@ protected:
 
 private:
   void createGui();
-  
+
   void updateMap(const Transmission::map_t& map);
 
   void updateScore();
 
-  Transmission::map_t currentMap;
+  PixmapItem ** visualMap;
 
   // data conversion
   QPoint mapPositionToCoord(unsigned int x, unsigned int y);
-- 
cgit v1.2.3