Fix to prevent segfaulting on 64-bit platforms.

[architektonas] / src / object.h

diff --git a/src/object.h b/src/object.h
index 330f5ad46b32833cd900655156ca888362258a73..b6f9558e452b9386a80cab88f841f49651dfa88c 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -1,9 +1,10 @@
 #ifndef __OBJECT_H__
 #define __OBJECT_H__
 
-#include "vector.h"
+#include <vector>                                                      // This is a container
+#include "vector.h"                                                    // This is the mathematical construct
 
-class QPainter;
+class Painter;
 class QFont;
 class Dimension;
 
@@ -16,7 +17,7 @@ class Object
                Object(Vector, Object * passedInParent = 0);
                ~Object();
 
-               virtual void Draw(QPainter *);
+               virtual void Draw(Painter *);
                virtual Vector Center(void);
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
@@ -26,6 +27,8 @@ class Object
                virtual Object * GetParent(void);
                virtual void Add(Object *);
                ObjectState GetState(void);
+               void Reparent(Object *);
+//Hm.          Object * Connect(Object *);
 
                // Class methods
                static void SetFixedAngle(bool state = true);
@@ -43,8 +46,8 @@ class Object
                ObjectState state;
                ObjectState oldState;
                bool needUpdate;
-               Dimension * dimPoint1;
-               Dimension * dimPoint2;
+               Dimension * attachedDimension;
+               std::vector<Object *> connected;
 
                // Class variables
                static QFont * font;