X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=b6f9558e452b9386a80cab88f841f49651dfa88c;hb=d9d9b7a1934adc548f2acc90a750d6f0451cdd3a;hp=330f5ad46b32833cd900655156ca888362258a73;hpb=b8c3c411826c1df00e54daeaf6cd820685f4f460;p=architektonas

diff --git a/src/object.h b/src/object.h
index 330f5ad..b6f9558 100644
--- 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;