X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fmodification.h;h=55345222fd6f3fdbf793ea23d7336edc0e1917d5;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=fc139dd7cbdf42c480ac7ab3122425336b8036b9;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/modification.h b/src/base/modification.h
index fc139dd..5534522 100644
--- a/src/base/modification.h
+++ b/src/base/modification.h
@@ -8,7 +8,7 @@
 /**
  * Holds the data needed for move modifications.
  */
-class RS_MoveData
+class MoveData
 {
 	public:
 		int number;
@@ -20,7 +20,7 @@ class RS_MoveData
 /**
  * Holds the data needed for rotation modifications.
  */
-class RS_RotateData
+class RotateData
 {
 	public:
 		int number;
@@ -33,7 +33,7 @@ class RS_RotateData
 /**
  * Holds the data needed for scale modifications.
  */
-class RS_ScaleData
+class ScaleData
 {
 	public:
 		int number;
@@ -46,7 +46,7 @@ class RS_ScaleData
 /**
  * Holds the data needed for mirror modifications.
  */
-class RS_MirrorData
+class MirrorData
 {
 	public:
 		bool copy;
@@ -59,7 +59,7 @@ class RS_MirrorData
 /**
  * Holds the data needed for move/rotate modifications.
  */
-class RS_MoveRotateData
+class MoveRotateData
 {
 	public:
 		int number;
@@ -73,7 +73,7 @@ class RS_MoveRotateData
 /**
  * Holds the data needed for rotation around two centers modifications.
  */
-class RS_Rotate2Data
+class Rotate2Data
 {
 	public:
 		int number;
@@ -88,7 +88,7 @@ class RS_Rotate2Data
 /**
  * Holds the data needed for beveling modifications.
  */
-class RS_BevelData
+class BevelData
 {
 	public:
 		double length1;
@@ -99,7 +99,7 @@ class RS_BevelData
 /**
  * Holds the data needed for rounding modifications.
  */
-class RS_RoundData
+class RoundData
 {
 	public:
 		double radius;
@@ -109,7 +109,7 @@ class RS_RoundData
 /**
  * Holds the data needed for moving reference points.
  */
-class RS_MoveRefData
+class MoveRefData
 {
 	public:
 		Vector ref;
@@ -119,11 +119,11 @@ class RS_MoveRefData
 /**
  * Holds the data needed for changing attributes.
  */
-class RS_AttributesData
+class AttributesData
 {
 	public:
 		QString layer;
-		RS_Pen pen;
+		Pen pen;
 		bool changeLayer;
 		bool changeColor;
 		bool changeLineType;
@@ -133,10 +133,10 @@ class RS_AttributesData
 /**
  * Holds the data needed for pasting.
  */
-class RS_PasteData
+class PasteData
 {
 	public:
-		RS_PasteData(Vector insertionPoint, double factor, double angle,
+		PasteData(Vector insertionPoint, double factor, double angle,
 			bool asInsert, const QString & blockName)
 		{
 			this->insertionPoint = insertionPoint;
@@ -170,69 +170,69 @@ class RS_PasteData
  *
  * @author Andrew Mustun
  */
-class RS_Modification
+class Modification
 {
 	public:
-		RS_Modification(RS_EntityContainer & entityContainer,
+		Modification(EntityContainer & entityContainer,
 			GraphicView * graphicView = NULL, bool handleUndo = true);
 
 		void remove();
-		bool changeAttributes(RS_AttributesData& data);
+		bool changeAttributes(AttributesData& data);
 
 		void copy(const Vector & ref, const bool cut);
 	private:
-		void copyEntity(RS_Entity * e, const Vector & ref, const bool cut);
+		void copyEntity(Entity * e, const Vector & ref, const bool cut);
 	public:
-		void copyLayers(RS_Entity * e);
-		void copyBlocks(RS_Entity * e);
-		void paste(const RS_PasteData & data, Drawing * source = NULL);
-
-		bool move(RS_MoveData & data);
-		bool rotate(RS_RotateData & data);
-		bool scale(RS_ScaleData & data);
-		bool mirror(RS_MirrorData & data);
-		bool moveRotate(RS_MoveRotateData & data);
-		bool rotate2(RS_Rotate2Data & data);
-
-		bool trim(const Vector & trimCoord, RS_AtomicEntity * trimEntity,
-			const Vector & limitCoord, RS_Entity * limitEntity,
+		void copyLayers(Entity * e);
+		void copyBlocks(Entity * e);
+		void paste(const PasteData & data, Drawing * source = NULL);
+
+		bool move(MoveData & data);
+		bool rotate(RotateData & data);
+		bool scale(ScaleData & data);
+		bool mirror(MirrorData & data);
+		bool moveRotate(MoveRotateData & data);
+		bool rotate2(Rotate2Data & data);
+
+		bool trim(const Vector & trimCoord, AtomicEntity * trimEntity,
+			const Vector & limitCoord, Entity * limitEntity,
 			bool both);
-		bool trimAmount(const Vector & trimCoord, RS_AtomicEntity * trimEntity,
+		bool trimAmount(const Vector & trimCoord, AtomicEntity * trimEntity,
 			double dist);
 
-		bool cut(const Vector& cutCoord, RS_AtomicEntity* cutEntity);
+		bool cut(const Vector& cutCoord, AtomicEntity* cutEntity);
 		bool stretch(const Vector & firstCorner, const Vector & secondCorner,
 			const Vector & offset);
 
-		bool bevel(const Vector & coord1, RS_AtomicEntity * entity1,
-			const Vector & coord2, RS_AtomicEntity * entity2,
-			RS_BevelData & data);
-		bool round(const Vector & coord, const Vector & coord1, RS_AtomicEntity * entity1,
-			const Vector & coord2, RS_AtomicEntity * entity2, RS_RoundData & data);
+		bool bevel(const Vector & coord1, AtomicEntity * entity1,
+			const Vector & coord2, AtomicEntity * entity2,
+			BevelData & data);
+		bool round(const Vector & coord, const Vector & coord1, AtomicEntity * entity1,
+			const Vector & coord2, AtomicEntity * entity2, RoundData & data);
 
 		bool explode();
 		bool explodeTextIntoLetters();
-		bool explodeTextIntoLetters(RS_Text * text, QList<RS_Entity *> & addList);
-		bool moveRef(RS_MoveRefData & data);
-
-		bool splitPolyline(RS_Polyline & polyline, RS_Entity & e1, Vector v1,
-			RS_Entity & e2, Vector v2, RS_Polyline ** polyline1, RS_Polyline ** polyline2) const;
-		RS_Polyline * addPolylineNode(RS_Polyline& polyline,
-			const RS_AtomicEntity& segment, const Vector& node);
-		RS_Polyline * deletePolylineNode(RS_Polyline& polyline, const Vector& node);
-		RS_Polyline * deletePolylineNodesBetween(RS_Polyline & polyline, RS_AtomicEntity & segment,
+		bool explodeTextIntoLetters(Text * text, QList<Entity *> & addList);
+		bool moveRef(MoveRefData & data);
+
+		bool splitPolyline(Polyline & polyline, Entity & e1, Vector v1,
+			Entity & e2, Vector v2, Polyline ** polyline1, Polyline ** polyline2) const;
+		Polyline * addPolylineNode(Polyline& polyline,
+			const AtomicEntity& segment, const Vector& node);
+		Polyline * deletePolylineNode(Polyline& polyline, const Vector& node);
+		Polyline * deletePolylineNodesBetween(Polyline & polyline, AtomicEntity & segment,
 			const Vector& node1, const Vector & node2);
-		RS_Polyline * polylineTrim(RS_Polyline & polyline,
-			RS_AtomicEntity & segment1, RS_AtomicEntity & segment2);
+		Polyline * polylineTrim(Polyline & polyline,
+			AtomicEntity & segment1, AtomicEntity & segment2);
 
 	private:
 		void deselectOriginals(bool remove);
-		void addNewEntities(QList<RS_Entity *> & addList);
+		void addNewEntities(QList<Entity *> & addList);
 
 	protected:
-		RS_EntityContainer * container;
+		EntityContainer * container;
 		Drawing * graphic;
-		RS_Document * document;
+		Document * document;
 		GraphicView * graphicView;
 		bool handleUndo;
 };