# HG changeset patch
# User insilmaril
# Date 1194535683 0
# Node ID 7ee5bf3647d318c856348b8a88ca84edae2288c2
# Parent  16d63fc9ae425e47697041af6ffb160d3a433aff
1.11.2 split up of xml helper functions. started to work on attributes

diff -r 16d63fc9ae42 -r 7ee5bf3647d3 misc.cpp
--- a/misc.cpp	Thu Nov 08 15:28:03 2007 +0000
+++ b/misc.cpp	Thu Nov 08 15:28:03 2007 +0000
@@ -83,22 +83,6 @@
 }
 
 
-// returns masked "<" ">" "&"
-QString quotemeta(const QString &s)
-{
-	QString r=s;
-    QRegExp  rx("&(?!amp;)");
-    r.replace ( rx,"&amp;");
-    rx.setPattern( ">");
-    r.replace ( rx,"&gt;");
-    rx.setPattern( "<");
-    r.replace ( rx,"&lt;");
-    rx.setPattern( "\"");
-    r.replace ( rx,"&quot;");
-    return r;
-}
-
-
 qreal max(qreal a, qreal b)
 {
 	if (a>b)
@@ -106,75 +90,3 @@
 	return b;
 }
 
-int xmlObj::actindent=0;		// make instance of actindent
-
-xmlObj::xmlObj()
-{
-    indentwidth=4;
-}
-
-
-// returns <s at />
-QString xmlObj::singleElement(QString s, QString at)
-{
-    return indent() + "<" + s +" " + at +" " + "/>\n";
-}
-
-// returns <s>
-QString xmlObj::beginElement(QString s)
-{
-    return indent() + "<" + s + ">\n";
-}
-
-// returns <s at>
-QString xmlObj::beginElement(QString s, QString at)
-{
-    return indent() + "<" + s + " " + at + ">\n";
-}
-
-// returns </s>
-QString xmlObj::endElement(QString s)
-{
-    return indent() + "</" + s + ">\n";
-}
-
-// returns  at="val"
-QString xmlObj::attribut(QString at, QString val)
-{
-    return " " + at + "=\"" + quotemeta (val) + "\""; 
-}
-
-// returns <s> val </s>
-QString xmlObj::valueElement(QString el, QString val)
-{
-    return indent() + "<" + el + ">" + quotemeta(val) + "</" +el + ">\n";
-}
-
-// returns <s at> val </s>
-QString xmlObj::valueElement(QString el, QString val, QString at)
-{
-    return indent() + "<" + el + " " + at + ">" + quotemeta(val) + "</" +el + ">\n";
-}
-
-void xmlObj::incIndent()
-{
-    actindent++;
-}	
-
-void xmlObj::decIndent()
-{
-    actindent--;
-    if (actindent<0) actindent=0;
-}	
-
-QString xmlObj::indent()
-{
-    QString s;
-    int i;
-    for (i=0; i<actindent*indentwidth; i++)
-    {
-		s= s + " ";
-    }
-    return s;
-}	
-
diff -r 16d63fc9ae42 -r 7ee5bf3647d3 misc.h
--- a/misc.h	Thu Nov 08 15:28:03 2007 +0000
+++ b/misc.h	Thu Nov 08 15:28:03 2007 +0000
@@ -15,30 +15,8 @@
 extern ostream &operator<< (ostream &stream, QPointF const &p);
 qreal getAngle(const QPointF &);
 QPointF normalise (const QPointF &);
-QString quotemeta(const QString&);	
 qreal max (qreal,qreal);
 class BranchObj;
 class MapEditor;
 
-/////////////////////////////////////////////////////////////////////////////
-class xmlObj
-{
-public:
-    xmlObj();
-    QString singleElement(QString,QString);			// name,attr
-    QString beginElement(QString,QString);			// name,attr
-    QString beginElement(QString);					// name
-    QString endElement  (QString);					// name
-    QString attribut    (QString,QString);			// name, val
-    QString valueElement(QString,QString);			// name, val
-    QString valueElement(QString,QString,QString);	// name, attr, val
-    void incIndent();
-    void decIndent();
-    static int actindent;
-
-protected:  
-    QString indent();
-    int indentwidth;
-};
-
 #endif
diff -r 16d63fc9ae42 -r 7ee5bf3647d3 noteobj.h
--- a/noteobj.h	Thu Nov 08 15:28:03 2007 +0000
+++ b/noteobj.h	Thu Nov 08 15:28:03 2007 +0000
@@ -5,12 +5,12 @@
 
 class NoteObj;
 
-#include "misc.h"
+#include "xmlobj.h"
 
 /*! \brief The text note belonging to one OrnamentedObj */
 
 
-class NoteObj:public xmlObj
+class NoteObj:public XMLObj
 {
 public:
 	NoteObj();