From 2a2c8d3b30e99e2bd636891a2eef27c0f35dcbc3 Mon Sep 17 00:00:00 2001
From: totycro <totycro@unknown-horizons.org>
Date: Sun, 3 Apr 2011 17:37:14 +0200
Subject: Use MainWindow

---
 pacman-c++/actor.cpp  | 4 ++--
 pacman-c++/main.cpp   | 9 ++++++---
 pacman-c++/pacman.pro | 6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'pacman-c++')

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
index 576fded..860f490 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/actor.cpp
@@ -1,7 +1,7 @@
 #include "actor.h"
 
 Actor::Actor(Type type)
-  : PixmapItem("google-pacman-sprite"), m_type(type), m_direction(Actor::None)
+    : PixmapItem("google-pacman-sprite"), m_type(type), m_direction(Actor::None)
 {
-  setSprite(2, 2, 16, 16);
+    setSprite(2, 2, 16, 16);
 }
diff --git a/pacman-c++/main.cpp b/pacman-c++/main.cpp
index cceb8f5..4b88b44 100644
--- a/pacman-c++/main.cpp
+++ b/pacman-c++/main.cpp
@@ -12,6 +12,7 @@ int main(int argc, char **argv)
 
   Actor *actor1 = new Actor(Actor::Player1);
   scene.addItem(actor1);
+  actor1->setPos(100,100);
 
   QGraphicsView window(&scene);
   window.setFrameStyle(0);
@@ -19,9 +20,11 @@ int main(int argc, char **argv)
   window.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   window.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-  window.resize(300, 300);
-  window.show();
-
+  QMainWindow mainWin;
+  mainWin.setCentralWidget(&window);
+  mainWin.resize(300, 300);
+  mainWin.show();
+  
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   return app.exec();
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index a94121d..6b705a8 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -4,3 +4,9 @@ SOURCES += main.cpp \
 HEADERS += pixmapitem.h \
     actor.h
 RESOURCES += pacman.qrc
+
+
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+
+
-- 
cgit v1.2.3