1 files changed, 2 insertions, 9 deletions

diff --git a/core/pim/datebook/holiday/national/nationalcfg.cpp b/core/pim/datebook/holiday/national/nationalcfg.cpp
index a293251..52c453f 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.cpp
+++ b/core/pim/datebook/holiday/national/nationalcfg.cpp
@@ -16,43 +16,38 @@ NHcfg::NHcfg()
 {

 }

 

 NHcfg::~NHcfg()

 {

 }

 

 bool NHcfg::load(const QString&aPath)

 {

     _path=aPath;

     stage = 0;

     _content.clear();

-    odebug << "Start loading file "<<_path<<oendl;

     QFile *f=new QFile(_path);

     if (!f) {

         oerr << "Could not open file" << oendl;

         return false;

     }

-    odebug << "Source" << oendl;

     QXmlInputSource is(*f);

-    odebug << "Reader" << oendl;

     QXmlSimpleReader reader;

-    odebug << "Handler" << oendl;

     reader.setContentHandler(this);

-    odebug << "Error handler" << oendl;

     reader.setErrorHandler(this);

 

     err = "";

-    odebug << "parse it" << oendl;

     bool ret = reader.parse(is);

-    odebug << "Errors: " << err << oendl;

+    if (err.length()>0)

+        odebug << "Errors: " << err << oendl;

     return ret;

 }

 

 const tholidaylist&NHcfg::days()const

 {

     return _content;

 }

 

 bool NHcfg::warning(const QXmlParseException& e)

 {

         QString tmp;

 

@@ -82,25 +77,24 @@ bool NHcfg::fatalError(const QXmlParseException& e)
 

         tmp.sprintf("%d: fatal error: %s\n", e.lineNumber(),

                 (const char*) e.message().utf8());

 

         err += tmp;

 

         return false;

 }

 

 bool NHcfg::startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr)

 {

     bool ret = false;

-    odebug << "startElement: " << name << oendl;

     if (name==_key_doc) {

         stage = 1;

         return true;

     }

     if (stage == 0) {

         err = "This is not a national holiday config file";

         return false;

     }

     if (name==_key_desc) {

         stage = 2;

         ret = setName(attr);

         return ret;

@@ -135,15 +129,14 @@ bool NHcfg::endElement(const QString&, const QString&,const QString& name)
 const QString&NHcfg::errorString()const

 {

     return err;

 }

 

 bool NHcfg::setName(const QXmlAttributes&attr)

 {

     int nindx = attr.index("value");

     if (nindx==-1) {

         return false;

     }

     _contentname = attr.value(nindx);

-    odebug << "Contentname = " << _contentname<<oendl;

     return true;

 }