diff -r 3d8bce9e1a9f -r 4c7de3e5789a MixedView/mainwindow.h --- a/MixedView/mainwindow.h Mon Oct 25 10:46:37 2010 -0700 +++ b/MixedView/mainwindow.h Tue Oct 26 09:48:36 2010 -0700 @@ -29,10 +29,9 @@ private: Ui::MainWindow *ui; - QGraphicsEllipseItem *mPacman; + QGraphicsEllipseItem *mPacman, *mPacCollider; QTimer *mUpdateTimer; int mPacState; - bool bIsMoving; QAccelerometer *mAccelerometer; qreal xAxis, yAxis; QPointF mLastPt; @@ -45,6 +44,7 @@ QAudioOutput* mAudio; QFile file; + private slots: void updateGraphics(); void updateReading(); @@ -53,6 +53,7 @@ private: void setupBoundries(); + void checkCollisions(); };