X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fatomicentity.cpp;h=ee164c0ee135c89d4141186adf5d84ccfd7f87d0;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=7e215d20408ad53a519916315757806940e60c7a;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/atomicentity.cpp b/src/base/atomicentity.cpp
index 7e215d2..ee164c0 100644
--- a/src/base/atomicentity.cpp
+++ b/src/base/atomicentity.cpp
@@ -19,14 +19,14 @@
 /**
  * Construtor.
  */
-RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Entity(parent)
+AtomicEntity::AtomicEntity(EntityContainer * parent/*= NULL*/): Entity(parent)
 {
 }
 
 /**
  * Destrutor.
  */
-/*virtual*/ RS_AtomicEntity::~RS_AtomicEntity()
+/*virtual*/ AtomicEntity::~AtomicEntity()
 {
 }
 
@@ -34,7 +34,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
  * @return false because entities made from subclasses are
  *  atomic entities.
  */
-/*virtual*/ bool RS_AtomicEntity::isContainer() const
+/*virtual*/ bool AtomicEntity::isContainer() const
 {
 	return false;
 }
@@ -43,7 +43,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
  * @return true because entities made from subclasses are
  *  atomic entities.
  */
-/*virtual*/ bool RS_AtomicEntity::isAtomic() const
+/*virtual*/ bool AtomicEntity::isAtomic() const
 {
 	return true;
 }
@@ -51,7 +51,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * @return Always 1 for atomic entities.
  */
-/*virtual*/ unsigned long int RS_AtomicEntity::count()
+/*virtual*/ unsigned long int AtomicEntity::count()
 {
 	return 1;
 }
@@ -59,7 +59,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * @return Always 1 for atomic entities.
  */
-/*virtual*/ unsigned long int RS_AtomicEntity::countDeep()
+/*virtual*/ unsigned long int AtomicEntity::countDeep()
 {
 	return 1;
 }
@@ -68,7 +68,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
  * Implementation must return the endpoint of the entity or
  * an invalid vector if the entity has no endpoint.
  */
-/*virtual*/ Vector RS_AtomicEntity::getEndpoint() const
+/*virtual*/ Vector AtomicEntity::getEndpoint() const
 {
 	return Vector(false);
 }
@@ -77,7 +77,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
  * Implementation must return the startpoint of the entity or
  * an invalid vector if the entity has no startpoint.
  */
-/*virtual*/ Vector RS_AtomicEntity::getStartpoint() const
+/*virtual*/ Vector AtomicEntity::getStartpoint() const
 {
 	return Vector(false);
 }
@@ -85,7 +85,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * Implementation must return the angle in which direction the entity starts.
  */
-/*virtual*/ double RS_AtomicEntity::getDirection1() const
+/*virtual*/ double AtomicEntity::getDirection1() const
 {
 	return 0.0;
 }
@@ -93,7 +93,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * Implementation must return the angle in which direction the entity starts the opposite way.
  */
-/*virtual*/ double RS_AtomicEntity::getDirection2() const
+/*virtual*/ double AtomicEntity::getDirection2() const
 {
 	return 0.0;
 }
@@ -101,7 +101,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * (De-)selects startpoint.
  */
-/*virtual*/ void RS_AtomicEntity::setStartpointSelected(bool select)
+/*virtual*/ void AtomicEntity::setStartpointSelected(bool select)
 {
 	if (select)
 		setFlag(RS2::FlagSelected1);
@@ -112,7 +112,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * (De-)selects endpoint.
  */
-/*virtual*/ void RS_AtomicEntity::setEndpointSelected(bool select)
+/*virtual*/ void AtomicEntity::setEndpointSelected(bool select)
 {
 	if (select)
 		setFlag(RS2::FlagSelected2);
@@ -123,7 +123,7 @@ RS_AtomicEntity::RS_AtomicEntity(RS_EntityContainer * parent/*= NULL*/): RS_Enti
 /**
  * @return True if the entities startpoint is selected.
  */
-bool RS_AtomicEntity::isStartpointSelected() const
+bool AtomicEntity::isStartpointSelected() const
 {
 	return getFlag(RS2::FlagSelected1);
 }
@@ -131,7 +131,7 @@ bool RS_AtomicEntity::isStartpointSelected() const
 /**
  * @return True if the entities endpoint is selected.
  */
-bool RS_AtomicEntity::isEndpointSelected() const
+bool AtomicEntity::isEndpointSelected() const
 {
 	return getFlag(RS2::FlagSelected2);
 }
@@ -140,7 +140,7 @@ bool RS_AtomicEntity::isEndpointSelected() const
  * Implementation must move the startpoint of the entity to
  * the given position.
  */
-/*virtual*/ void RS_AtomicEntity::moveStartpoint(const Vector & /*pos*/)
+/*virtual*/ void AtomicEntity::moveStartpoint(const Vector & /*pos*/)
 {
 }
 
@@ -148,7 +148,7 @@ bool RS_AtomicEntity::isEndpointSelected() const
  * Implementation must move the endpoint of the entity to
  * the given position.
  */
-/*virtual*/ void RS_AtomicEntity::moveEndpoint(const Vector & /*pos*/)
+/*virtual*/ void AtomicEntity::moveEndpoint(const Vector & /*pos*/)
 {
 }
 
@@ -156,7 +156,7 @@ bool RS_AtomicEntity::isEndpointSelected() const
  * Implementation must trim the startpoint of the entity to
  * the given position.
  */
-/*virtual*/ void RS_AtomicEntity::trimStartpoint(const Vector & pos)
+/*virtual*/ void AtomicEntity::trimStartpoint(const Vector & pos)
 {
 	moveStartpoint(pos);
 }
@@ -165,7 +165,7 @@ bool RS_AtomicEntity::isEndpointSelected() const
 * Implementation must trim the endpoint of the entity to
 * the given position.
 */
-/*virtual*/ void RS_AtomicEntity::trimEndpoint(const Vector & pos)
+/*virtual*/ void AtomicEntity::trimEndpoint(const Vector & pos)
 {
 	moveEndpoint(pos);
 }
@@ -176,16 +176,16 @@ bool RS_AtomicEntity::isEndpointSelected() const
 * trim entity and 'trimPoint' is the point to which the entity will
 * be trimmed.
 */
-/*virtual*/ RS2::Ending RS_AtomicEntity::getTrimPoint(const Vector & /*coord*/, const Vector & /*trimPoint*/)
+/*virtual*/ RS2::Ending AtomicEntity::getTrimPoint(const Vector & /*coord*/, const Vector & /*trimPoint*/)
 {
 	return RS2::EndingNone;
 }
 
-/*virtual*/ void RS_AtomicEntity::reverse()
+/*virtual*/ void AtomicEntity::reverse()
 {
 }
 
-/*virtual*/ void RS_AtomicEntity::moveSelectedRef(const Vector & ref, const Vector & offset)
+/*virtual*/ void AtomicEntity::moveSelectedRef(const Vector & ref, const Vector & offset)
 {
 	if (isSelected())
 		moveRef(ref, offset);