X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Futils.h;h=6fd59d0adaf3eca3bf93f99b47251b7f347f1bde;hb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;hp=a72ca394750078324440e9a7c54598600bce50c1;hpb=c20f82651fdc4dd26172bcb71a85e6eb29eacd43;p=architektonas

diff --git a/src/utils.h b/src/utils.h
index a72ca39..6fd59d0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -4,22 +4,27 @@
 #include <vector>
 #include "structs.h"
 
-void CopyObjects(std::vector<void *> & from, std::vector<void *> & to);
+void CopyObjects(VPVector & from, VPVector & to);
+VPVector CopyObjects(VPVector & from);
 Object * CopyObject(Object * obj);
-void MoveSelectedObjectsTo(std::vector<void *> & dest, std::vector<void *> & from);
-void CopySelectedObjectsTo(std::vector<void *> & dest, std::vector<void *> & from);
-void AddObjectsTo(std::vector<void *> & dest, std::vector<void *> & from);
-void ClearSelected(std::vector<void *> & v);
-void SelectAll(std::vector<void *> & v);
-void DeleteContents(std::vector<void *> & v);
-void DeleteSelectedObjects(std::vector<void *> & v);
-void RemoveSelectedObjects(std::vector<void *> & v);
-void SavePointsFrom(std::vector<void *> & v, std::vector<Object> & s);
-void RestorePointsTo(std::vector<void *> & v, std::vector<Object> & s);
-void RestorePointsTo(std::vector<void *> & v, std::vector<void *> & s);
+Object * CopyObject2(Object * obj);
+void MoveSelectedObjectsTo(VPVector & dest, VPVector & from);
+VPVector MoveSelectedObjectsFrom(VPVector & from);
+void CopySelectedObjectsTo(VPVector & dest, VPVector & from);
+VPVector CopySelectedObjects(VPVector & from);
+void AddObjectsTo(VPVector & dest, VPVector & from);
+void ClearSelected(VPVector & v);
+void SelectAll(VPVector & v);
+void DeleteContents(VPVector & v);
+void DeleteSelectedObjects(VPVector & v);
+void RemoveSelectedObjects(VPVector & v);
+void SavePointsFrom(VPVector & v, std::vector<Object> & s);
+void RestorePointsTo(VPVector & v, std::vector<Object> & s);
+void RestorePointsTo(VPVector & v, VPVector & s);
 void TranslateObject(Object * obj, Point delta);
 void TranslateContainer(Container * c, Point point, Point delta);
-void TranslateObjects(std::vector<void *> & v, Point delta);
-std::vector<void *> Flatten(Container * src);
+void TranslateObjects(VPVector & v, Point delta);
+VPVector Flatten(Container * src);
+VPVector Flatten(VPVector src);
 
 #endif	// __UTILS_H__