Added missing readme and GPL license file.

[architektonas] / src / base / rs_filtercxf.cpp

diff --git a/src/base/rs_filtercxf.cpp b/src/base/rs_filtercxf.cpp
index 887bf5d2184e8f8b2e29e45537069f5848b895a3..1040b03f1a47b109fcdbaa3c0c397cb4a71e52db 100644 (file)
--- a/src/base/rs_filtercxf.cpp
+++ b/src/base/rs_filtercxf.cpp
@@ -18,7 +18,6 @@
 #include <fstream>
 #include <QtCore>
 
-//#include "rs_regexp.h"
 #include "rs_font.h"
 #include "rs_utility.h"
 #include "rs_system.h"
@@ -46,7 +45,7 @@ RS_FilterCXF::~RS_FilterCXF()
  * will be created or the graphics from which the entities are
  * taken to be stored in a file.
  */
-bool RS_FilterCXF::fileImport(RS_Graphic & g, const QString & file, RS2::FormatType /*type*/)
+bool RS_FilterCXF::fileImport(Drawing & g, const QString & file, RS2::FormatType /*type*/)
 {
        RS_DEBUG->print("CXF Filter: importing file '%s'...", file.toLatin1().data());
 
@@ -54,11 +53,11 @@ bool RS_FilterCXF::fileImport(RS_Graphic & g, const QString & file, RS2::FormatT
        bool success = false;
 
        // Load font file as we normally do, but the font doesn't own the
-       //  letters (we'll add them to the graphic instead. Hence 'false').
+       // letters (we'll add them to the graphic instead. Hence 'false').
        RS_Font font(file, false);
        success = font.loadFont();
 
-       if (success == false)
+       if (!success)
        {
                RS_DEBUG->print(RS_Debug::D_WARNING, "Cannot open CXF file '%s'.", file.toLatin1().data());
                return false;
@@ -75,15 +74,15 @@ bool RS_FilterCXF::fileImport(RS_Graphic & g, const QString & file, RS2::FormatT
 
        RS_BlockList * letterList = font.getLetterList();
 
-       for(uint i=0; i<font.countLetters(); ++i)
+       for(uint i=0; i<font.countLetters(); i++)
        {
-               RS_Block* ch = font.letterAt(i);
+               RS_Block * ch = font.letterAt(i);
 
                QString uCode;
                uCode.setNum(ch->getName().at(0).unicode(), 16);
 
                while (uCode.length() < 4)
-                       uCode="0"+uCode;
+                       uCode = "0" + uCode;
 
                //ch->setName("[" + uCode + "] " + ch->getName());
                //letterList->rename(ch, QString("[%1]").arg(ch->getName()));
@@ -104,9 +103,9 @@ bool RS_FilterCXF::fileImport(RS_Graphic & g, const QString & file, RS2::FormatT
  *
  * @param file Full path to the CXF file that will be written.
  */
-bool RS_FilterCXF::fileExport(RS_Graphic & g, const QString & file, RS2::FormatType /*type*/)
+bool RS_FilterCXF::fileExport(Drawing & g, const QString & file, RS2::FormatType /*type*/)
 {
-       RS_DEBUG->print("CXF Filter: exporting file '%s'...", file.toLatin1().data());
+       RS_DEBUG->print("CXF Filter: exporting file '%s'...", file.toAscii().data());
 
        // crashes under windoze xp:
        //std::ofstream fout;