diff -r ebebedffba50 -r ff98aee6fb99 xml-freemind.cpp
--- a/xml-freemind.cpp	Mon Jul 23 12:42:02 2007 +0000
+++ b/xml-freemind.cpp	Mon Oct 22 09:50:09 2007 +0000
@@ -19,14 +19,7 @@
 
 extern QString flagsPath;
 
-parseFMHandler::parseFMHandler() {}
-
-parseFMHandler::~parseFMHandler() {}
-
-QString parseFMHandler::errorProtocol() { return errorProt; }
-
-
-bool parseFMHandler::startDocument()
+bool parseFreemindHandler::startDocument()
 {
     errorProt = "";
     state = StateInit;
@@ -34,13 +27,12 @@
 	stateStack.clear();
 	stateStack.append(StateInit);
     branchDepth=0;
-	htmldata="";
 	isVymPart=false;
     return true;
 }
 
 
-QString parseFMHandler::parseHREF(QString href)
+QString parseFreemindHandler::parseHREF(QString href)
 {
 	QString type=href.section(":",0,0);
 	QString path=href.section(":",1,1);
@@ -50,7 +42,7 @@
 		return tmpDir + path;
 }
 
-bool parseFMHandler::startElement  ( const QString&, const QString&,
+bool parseFreemindHandler::startElement  ( const QString&, const QString&,
                     const QString& eName, const QXmlAttributes& atts ) 
 {
     QColor col;
@@ -148,7 +140,7 @@
 			else if (f=="button_cancel")
 				v="cross-red"; 
 			else if (f.contains("full-"))
-				v=f.replace("full-","freemind-priority-"); //FIXME
+				v=f.replace("full-","freemind-priority-"); 
 			else if (f=="back")
 				v="freemind-back"; 
 			else if (f=="forward")
@@ -208,7 +200,7 @@
     return true;
 }
 
-bool parseFMHandler::endElement  ( const QString&, const QString&, const QString &eName)
+bool parseFreemindHandler::endElement  ( const QString&, const QString&, const QString &eName)
 {
 	/* Testing
 	cout << "endElement </" <<eName.ascii()
@@ -229,7 +221,7 @@
 	return true;
 }
 
-bool parseFMHandler::characters   ( const QString& ch)
+bool parseFreemindHandler::characters   ( const QString& ch)
 {
 	//cout << "characters \""<<ch.ascii()<<"\"  state="<<state <<"  laststate="<<laststate<<endl;
 
@@ -257,59 +249,12 @@
     return true;
 }
 
-QString parseFMHandler::errorString() 
+QString parseFreemindHandler::errorString() 
 {
-    return "the document is not in the VYM file format";
+    return "the document is not in the Freemind file format";
 }
 
-bool parseFMHandler::fatalError( const QXmlParseException& exception ) 
-{
-    errorProt += QString( "Fatal parsing error: %1 in line %2, column %3\n")
-    .arg( exception.message() )
-    .arg( exception.lineNumber() )
-    .arg( exception.columnNumber() );
-	// Try to read the bogus line
-	errorProt+=QString("File is: %1\n").arg(inputFile);
-	QString s;
-	if (loadStringFromDisk (inputFile,s))
-	{
-		QStringList sl=QStringList::split ("\n",s);
-		int i=1;
-		QStringList::Iterator it = sl.begin();
-		while (i<exception.lineNumber())
-		{
-			it++;
-			i++;
-		}
-		s=*it;
-		s.insert (exception.columnNumber()-1,"<ERROR>");
-		errorProt+=s;
-    }
-    return QXmlDefaultHandler::fatalError( exception );
-}
-
-void parseFMHandler::setMapEditor (MapEditor* e)
-{
-    me=e;
-	mc=me->getMapCenter();
-}
-
-void parseFMHandler::setTmpDir (QString tp)
-{
-	tmpDir=tp;
-}
-
-void parseFMHandler::setInputFile (QString f)
-{
-	inputFile=f;
-}
-
-void parseFMHandler::setLoadMode (const LoadMode &lm)
-{
-	loadMode=lm;
-}
-
-bool parseFMHandler::readNodeAttr (const QXmlAttributes& a)
+bool parseFreemindHandler::readNodeAttr (const QXmlAttributes& a)
 {
 	lastOO=lastBranch;