Phase two of adding polyline functionality...

[architektonas] / src / base / paintinterface.h

diff --git a/src/base/paintinterface.h b/src/base/paintinterface.h
index 3815dd0c28767e97470e2794facba4facc57d6e8..94701cf4fb21cdfd562223350d9fd7c4a2bd74f0 100644 (file)
--- a/src/base/paintinterface.h
+++ b/src/base/paintinterface.h
@@ -1,11 +1,11 @@
-#ifndef __PAINTINTERFACE_H__
-#define __PAINTINTERFACE_H__
+#ifndef ____PAINTINTERFACE_H____
+#define ____PAINTINTERFACE_H____
 
 #include <QtGui>
-#include "rs.h"
+#include "enums.h"
 #include "vector.h"
-#include "rs_color.h"
-#include "rs_pen.h"
+#include "color.h"
+#include "pen.h"
 
 // This is an interface class to the rest of the RS_* functions that are supposed
 // to be toolkit independent, but, because the author of QCad had no idea how to
@@ -38,16 +38,17 @@ class PaintInterface
                        double angle, double angle1, double angle2, bool reversed);
                void drawImg(QImage & img, const Vector & pos,
                        double angle, const Vector & factor, int sx, int sy, int sw, int sh);
-               void fillRect(int x1, int y1, int w, int h, const RS_Color & col);
+               void fillRect(int x1, int y1, int w, int h, const Color & col);
                void fillTriangle(const Vector & p1, const Vector & p2, const Vector & p3);
-               void drawHandle(const Vector & p, const RS_Color & c, int size = -1);
+               void drawHandle(const Vector & p, const Color & c, int size = -1);
                void setPreviewPen();
-               RS_Pen getPen();
-               void setPen(const RS_Pen & pen);
-               void setPen(const RS_Color & color);
+               Pen getPen();
+               void setPen(const Pen & pen);
+               void setPen(const Color & color);
                void setPen(int r, int g, int b);
                void disablePen();
-               void setBrush(const RS_Color & color);
+               void setBrush(const Color & color);
+               void disableBrush();
                void drawPolygon(const QPolygon & p);
                void erase();
                int getWidth();
@@ -72,7 +73,7 @@ class PaintInterface
                 * A fixed offset added to all entities drawn (useful for previews).
                 */
                Vector offset;
-               RS_Pen lpen;
+               Pen lpen;
 };
 
-#endif // __PAINTINTERFACE_H__
+#endif // __PAINTINTERFACE_H____