1.1 --- a/settings.cpp	Thu Nov 08 15:28:03 2007 +0000
     1.2 +++ b/settings.cpp	Thu Nov 08 15:28:03 2007 +0000
     1.3 @@ -245,7 +245,7 @@
     1.4  	}
     1.5  }
     1.6  
     1.7 -QString Settings::getXMLData (const QString &fpath)
     1.8 +QString Settings::getDataXML (const QString &fpath)
     1.9  {
    1.10  	QString s;
    1.11  	QStringList::Iterator itp=pathlist.begin();

     2.1 --- a/settings.h	Thu Nov 08 15:28:03 2007 +0000
     2.2 +++ b/settings.h	Thu Nov 08 15:28:03 2007 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4  #include <qstring.h>
     2.5  #include <qstringlist.h>
     2.6  
     2.7 -#include "misc.h"
     2.8 +#include "xmlobj.h"
     2.9  
    2.10  // Some helper functions and simplified settings class
    2.11  // to read and parse settings e.g.  in undo/redo directories
    2.12 @@ -29,7 +29,7 @@
    2.13  
    2.14  // Overloaded QSettings class, used to save some settings in 
    2.15  // a map instead of users home directory
    2.16 -class Settings:public QSettings,public xmlObj
    2.17 +class Settings:public QSettings,public XMLObj
    2.18  {
    2.19  public:
    2.20      Settings ();
    2.21 @@ -39,7 +39,7 @@
    2.22  	void clearLocal (const QString &);
    2.23  	QString readLocalEntry ( const QString &, const QString &, const QString &);
    2.24  	void setLocalEntry (const QString &, const QString &, const QString &);
    2.25 -	QString getXMLData (const QString &);
    2.26 +	QString getDataXML (const QString &);
    2.27  
    2.28  protected:
    2.29  	QStringList pathlist;