In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / base / document.h

diff --git a/src/base/document.h b/src/base/document.h
index dd5463c4624f30ced91669a2be50b4936d63b656..a8cf645d93f5ab493f895f572f4e49f1b8ce1e6a 100644 (file)
--- a/src/base/document.h
+++ b/src/base/document.h
@@ -5,25 +5,26 @@
 #include "entitycontainer.h"
 #include "undo.h"
 
-class RS_BlockList;
-class RS_LayerList;
+class BlockList;
+class LayerList;
 
 /**
- * Base class for documents. Documents can be either graphics or
- * blocks and are typically shown in graphic views. Documents hold
- * an active pen for drawing in the Document, a file name and they
- * know whether they have been modified or not.
+ * Base class for documents. Documents can be either Drawings or Blocks and are
+ * typically shown in graphic views. Documents hold an active pen for drawing
+ * in the Document, a file name and they know whether they have been modified
+ * or not.
  *
+ * @author James Hammons
  * @author Andrew Mustun
  */
-class RS_Document: public RS_EntityContainer, public RS_Undo
+class Document: public EntityContainer, public Undo
 {
        public:
-               RS_Document(RS_EntityContainer * parent = NULL);
-               virtual ~RS_Document();
+               Document(EntityContainer * parent = NULL);
+               virtual ~Document();
 
-               virtual RS_LayerList * getLayerList() = 0;
-               virtual RS_BlockList * getBlockList() = 0;
+               virtual LayerList * getLayerList() = 0;
+               virtual BlockList * getBlockList() = 0;
 
                virtual void newDoc() = 0;
                virtual bool save() = 0;
@@ -31,9 +32,9 @@ class RS_Document: public RS_EntityContainer, public RS_Undo
                virtual bool open(const QString &filename, RS2::FormatType type) = 0;
 
                virtual bool isDocument() const;
-               virtual void removeUndoable(RS_Undoable * u);
-               RS_Pen getActivePen() const;
-               void setActivePen(RS_Pen p);
+               virtual void removeUndoable(Undoable * u);
+               Pen getActivePen() const;
+               void setActivePen(Pen p);
                QString getFilename() const;
                void setFilename(const QString & fn);
                virtual void setModified(bool m);
@@ -44,7 +45,7 @@ class RS_Document: public RS_EntityContainer, public RS_Undo
                /** Flag set if the document was modified and not yet saved. */
                bool modified;
                /** Active pen. */
-               RS_Pen activePen;
+               Pen activePen;
                /** File name of the document or empty for a new document. */
                QString filename;
                /** Format type */