X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=2e2efffa5f5b14bb14c196052115ea84b0d6f521;hb=e11a07565fe5ef3dfafbf9a933d7a1575e058867;hp=efcffe1f00bd34990cb15102f19a8759990cace6;hpb=5446001bd9adfd9f4787f5de5a2a7afd8d7cdb5a;p=architektonas

diff --git a/src/object.h b/src/object.h
index efcffe1..2e2efff 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,12 +1,15 @@
 #ifndef __OBJECT_H__
 #define __OBJECT_H__
 
+#include <stdio.h>
 #include <vector>							// This is a container
 #include "vector.h"							// This is the mathematical construct
+#include "connection.h"
 
 class Painter;
 class QFont;
 class Dimension;
+//class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
 
@@ -27,9 +30,15 @@ class Object
 		virtual Object * GetParent(void);
 		virtual void Add(Object *);
 		virtual Vector * GetPointAt(Vector);
+		virtual void Enumerate(FILE *);
+		virtual Object * Copy(void);
+		virtual Vector GetPointAtParameter(double parameter);
+		virtual void Connect(Object *, double);
+		virtual void Disconnect(Object *, double);
+		virtual void DisconnectAll(Object *);
 		ObjectState GetState(void);
 		void Reparent(Object *);
-		Dimension * GetAttachedDimension(void);
+//		Dimension * GetAttachedDimension(void);
 //Hm.		Object * Connect(Object *);
 
 		// Class methods
@@ -49,8 +58,8 @@ class Object
 		ObjectState state;
 		ObjectState oldState;
 		bool needUpdate;
-		Dimension * attachedDimension;
-		std::vector<Object *> connected;
+//		Dimension * attachedDimension;
+		std::vector<Connection> connected;
 
 		// Class variables
 		static QFont * font;