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

[architektonas] / src / base / fileio.h

diff --git a/src/base/fileio.h b/src/base/fileio.h
index a564f782d9fa3b7e4854c1dbc46d056bab39fb5d..97b0f5a62a4469dcab72d39b123b1f4285fcb4ab 100644 (file)
--- a/src/base/fileio.h
+++ b/src/base/fileio.h
@@ -2,12 +2,12 @@
 #define __FILEIO_H__
 
 #include <QtCore>
-#include "rs.h"
+#include "enums.h"
 
-#define RS_FILEIO RS_FileIO::instance()
+#define FILEIO FileIO::instance()
 
 class Drawing;
-class RS_FilterInterface;
+class FilterInterface;
 
 /**
  * API Class for importing files.
@@ -15,26 +15,26 @@ class RS_FilterInterface;
  * @author James Hammons
  * @author Andrew Mustun
  */
-class RS_FileIO
+class FileIO
 {
        protected:
-               RS_FileIO();
+               FileIO();
 
        public:
-               static RS_FileIO * instance();
-               void registerFilter(RS_FilterInterface * f);
-               QList<RS_FilterInterface *> getFilterList();
-               RS_FilterInterface * getImportFilter(RS2::FormatType t);
-               RS_FilterInterface * getExportFilter(RS2::FormatType t);
-               bool fileImport(Drawing & graphic, const QString & file,
+               static FileIO * instance();
+               void registerFilter(FilterInterface * f);
+               QList<FilterInterface *> getFilterList();
+               FilterInterface * getImportFilter(RS2::FormatType t);
+               FilterInterface * getExportFilter(RS2::FormatType t);
+               bool fileImport(Drawing & dwg, const QString & file,
                        RS2::FormatType type = RS2::FormatUnknown);
-               bool fileExport(Drawing & graphic, const QString & file,
+               bool fileExport(Drawing & dwg, const QString & file,
                        RS2::FormatType type = RS2::FormatUnknown);
                RS2::FormatType detectFormat(const QString & file);
 
        protected:
-               static RS_FileIO * uniqueInstance;
-               QList<RS_FilterInterface *> filterList;
+               static FileIO * uniqueInstance;
+               QList<FilterInterface *> filterList;
 };
 
 #endif // __FILEIO_H__