Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / filterdxf.h

diff --git a/src/base/filterdxf.h b/src/base/filterdxf.h
index 1287da10d6e6afccb8cc13ecd77655e1e091a1e1..70801e049b83149ab0b3cd589e1d3ad10ca1d610 100644 (file)
--- a/src/base/filterdxf.h
+++ b/src/base/filterdxf.h
@@ -28,11 +28,11 @@ class DL_WriterA;
  *
  * @author Andrew Mustun
  */
-class RS_FilterDXF: public RS_FilterInterface, DL_CreationInterface
+class FilterDXF: public FilterInterface, DL_CreationInterface
 {
        public:
-               RS_FilterDXF();
-               ~RS_FilterDXF();
+               FilterDXF();
+               ~FilterDXF();
 
                /**
                * @return RS2::FormatDXF.
@@ -74,7 +74,7 @@ class RS_FilterDXF: public RS_FilterInterface, DL_CreationInterface
                virtual void addMText(const DL_MTextData & data);
                virtual void addText(const DL_TextData & data);
                //virtual void addDimension(const DL_DimensionData& data);
-               RS_DimensionData convDimensionData(const DL_DimensionData & data);
+               DimensionData convDimensionData(const DL_DimensionData & data);
                virtual void addDimAlign(const DL_DimensionData & data, const DL_DimAlignedData & edata);
                virtual void addDimLinear(const DL_DimensionData & data, const DL_DimLinearData & edata);
                virtual void addDimRadial(const DL_DimensionData & data, const DL_DimRadialData & edata);
@@ -100,44 +100,44 @@ class RS_FilterDXF: public RS_FilterInterface, DL_CreationInterface
                virtual bool fileExport(Drawing & g, const QString & file, RS2::FormatType type);
 
                void writeVariables(DL_WriterA & dw);
-               void writeLayer(DL_WriterA & dw, RS_Layer * l);
+               void writeLayer(DL_WriterA & dw, Layer * l);
                void writeLineType(DL_WriterA & dw, RS2::LineType t);
                void writeAppid(DL_WriterA & dw, const char * appid);
-               void writeBlock(DL_WriterA & dw, RS_Block * blk);
-               void writeEntity(DL_WriterA & dw, RS_Entity * e);
-               void writeEntity(DL_WriterA & dw, RS_Entity * e, const DL_Attributes & attrib);
-               void writePoint(DL_WriterA & dw, RS_Point * p, const DL_Attributes & attrib);
-               void writeLine(DL_WriterA & dw, RS_Line * l, const DL_Attributes & attrib);
-               void writePolyline(DL_WriterA & dw, RS_Polyline * l, const DL_Attributes & attrib);
-               void writeSpline(DL_WriterA & dw, RS_Spline * s, const DL_Attributes & attrib);
-               void writeCircle(DL_WriterA & dw, RS_Circle * c, const DL_Attributes & attrib);
-               void writeArc(DL_WriterA & dw, RS_Arc * a, const DL_Attributes & attrib);
-               void writeEllipse(DL_WriterA & dw, RS_Ellipse * s, const DL_Attributes & attrib);
-               void writeInsert(DL_WriterA & dw, RS_Insert * i, const DL_Attributes & attrib);
-               void writeText(DL_WriterA & dw, RS_Text * t, const DL_Attributes & attrib);
-               void writeDimension(DL_WriterA & dw, RS_Dimension * d, const DL_Attributes & attrib);
-               void writeLeader(DL_WriterA & dw, RS_Leader * l, const DL_Attributes & attrib);
-               void writeHatch(DL_WriterA & dw, RS_Hatch * h, const DL_Attributes & attrib);
-               void writeSolid(DL_WriterA & dw, RS_Solid * s, const DL_Attributes & attrib);
-               void writeImage(DL_WriterA & dw, RS_Image * i, const DL_Attributes & attrib);
-               void writeEntityContainer(DL_WriterA & dw, RS_EntityContainer * con,
+               void writeBlock(DL_WriterA & dw, Block * blk);
+               void writeEntity(DL_WriterA & dw, Entity * e);
+               void writeEntity(DL_WriterA & dw, Entity * e, const DL_Attributes & attrib);
+               void writePoint(DL_WriterA & dw, Point * p, const DL_Attributes & attrib);
+               void writeLine(DL_WriterA & dw, Line * l, const DL_Attributes & attrib);
+               void writePolyline(DL_WriterA & dw, Polyline * l, const DL_Attributes & attrib);
+               void writeSpline(DL_WriterA & dw, Spline * s, const DL_Attributes & attrib);
+               void writeCircle(DL_WriterA & dw, Circle * c, const DL_Attributes & attrib);
+               void writeArc(DL_WriterA & dw, Arc * a, const DL_Attributes & attrib);
+               void writeEllipse(DL_WriterA & dw, Ellipse * s, const DL_Attributes & attrib);
+               void writeInsert(DL_WriterA & dw, Insert * i, const DL_Attributes & attrib);
+               void writeText(DL_WriterA & dw, Text * t, const DL_Attributes & attrib);
+               void writeDimension(DL_WriterA & dw, Dimension * d, const DL_Attributes & attrib);
+               void writeLeader(DL_WriterA & dw, Leader * l, const DL_Attributes & attrib);
+               void writeHatch(DL_WriterA & dw, Hatch * h, const DL_Attributes & attrib);
+               void writeSolid(DL_WriterA & dw, Solid * s, const DL_Attributes & attrib);
+               void writeImage(DL_WriterA & dw, Image * i, const DL_Attributes & attrib);
+               void writeEntityContainer(DL_WriterA & dw, EntityContainer * con,
                        const DL_Attributes & attrib);
-               void writeAtomicEntities(DL_WriterA & dw, RS_EntityContainer * c,
+               void writeAtomicEntities(DL_WriterA & dw, EntityContainer * c,
                        const DL_Attributes & attrib, RS2::ResolveLevel level);
 
-               void writeImageDef(DL_WriterA & dw, RS_Image * i);
+               void writeImageDef(DL_WriterA & dw, Image * i);
 
-               void setEntityAttributes(RS_Entity * entity, const DL_Attributes& attrib);
-               DL_Attributes getEntityAttributes(RS_Entity * entity);
+               void setEntityAttributes(Entity * entity, const DL_Attributes& attrib);
+               DL_Attributes getEntityAttributes(Entity * entity);
 
                static QString toDxfString(const QString & string);
                static QString toNativeString(const QString & string);
 
        public:
-               RS_Pen attributesToPen(const DL_Attributes & attrib) const;
+               Pen attributesToPen(const DL_Attributes & attrib) const;
 
-               static RS_Color numberToColor(int num, bool comp = false);
-               static int colorToNumber(const RS_Color & col);
+               static Color numberToColor(int num, bool comp = false);
+               static int colorToNumber(const Color & col);
 
                static RS2::LineType nameToLineType(const QString& name);
                static QString lineTypeToName(RS2::LineType lineType);
@@ -162,21 +162,21 @@ class RS_FilterDXF: public RS_FilterInterface, DL_CreationInterface
                /** string for concatinating text parts of MTEXT entities. */
                QString mtext;
                /** Pointer to current polyline entity we're adding vertices to. */
-               RS_Polyline * polyline;
+               Polyline * polyline;
                /** Pointer to current spline entity we're adding control points to. */
-               RS_Spline * spline;
+               Spline * spline;
                /** Pointer to current leader entity we're adding vertices to. */
-               RS_Leader * leader;
+               Leader * leader;
                /** Pointer to current entity container (either block or graphic) */
-               RS_EntityContainer * currentContainer;
+               EntityContainer * currentContainer;
 
                /** Pointer to current hatch or NULL. */
-               RS_Hatch * hatch;
+               Hatch * hatch;
                /** Pointer to current hatch loop or NULL. */
-               RS_EntityContainer * hatchLoop;
+               EntityContainer * hatchLoop;
 
                DL_Dxf dxf;
-               RS_VariableDict variables;
+               VariableDict variables;
 };
 
 #endif // __FILTERDXF_H__