All of the files in this commit have an inheritance member function

mismatch correction. None are serious, but all would have been improperly
mislinked in the inheritance hierarchy if attempted to be used.

2 files changed, 2 insertions, 2 deletions

diff --git a/core/pim/datebook/holiday/national/nationalcfg.cpp b/core/pim/datebook/holiday/national/nationalcfg.cpp
index f71c833..33e9db3 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.cpp
+++ b/core/pim/datebook/holiday/national/nationalcfg.cpp
@@ -247,65 +247,65 @@ bool NHcfg::parseCalc(const QString&name,const QXmlAttributes&attr)
             m_currentEntry.setDayofmonth(value);

         break;

         case 5:

             m_currentEntry.setDaydep(value);

         break;

         case 6:

             m_currentEntry.setMonth(value);

         break;

     }

     return true;

 }

 

 bool NHcfg::endElement(const QString&, const QString&,const QString& name)

 {

 //    odebug << "End element: " << name << oendl;

     if (name==_key_entry) {

         if (m_currentEntry.type()==NHentry::fix) {

             currentFixList.append(m_currentEntry);

         } else {

             currentFloatList.append(m_currentEntry);

 //            odebug << "Floatlist count " << currentFloatList.count() << oendl;

         }

     } else if (name==_key_calc) {

 

     }

     if (stage>=3) {

         --level;

     }

 //    odebug << "Level == " << level << oendl;

     return true;

 }

 

-const QString&NHcfg::errorString()const

+QString NHcfg::errorString() const

 {

     return err;

 }

 

 NHentry::NHentry()

     :m_Type(fix)

 {

     m_Offset=0;

 }

 

 NHentry::~NHentry()

 {}

 

 void NHentry::setName(const QString&aName)

 {

     m_Name = aName;

 }

 

 const QString&NHentry::name()const

 {

     return m_Name;

 }

 

 void NHentry::setType(NHentry::entry_type aType)

 {

     m_Type = aType;

 }

 

 NHentry::entry_type NHentry::type()const

 {

     return m_Type;

 }

diff --git a/core/pim/datebook/holiday/national/nationalcfg.h b/core/pim/datebook/holiday/national/nationalcfg.h
index 872df65..2aedd95 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.h
+++ b/core/pim/datebook/holiday/national/nationalcfg.h
@@ -28,48 +28,48 @@ public:
     const QString&dayofmonth()const;

     void setDaydep(const QString&);

     const QString&daydep()const;

     void setMonth(const QString&);

     const QString&month()const;

     void setOffet(int);

     const int offset()const;

 

 protected:

     entry_type m_Type;

     QString m_Name,m_Weekday,m_Dayofmonth,m_Depth,m_Month;

     QDate m_Date;

     int m_Offset;

 };

 

 typedef QValueList<NHentry> tentrylist;

 

 class NHcfg:public QXmlDefaultHandler

 {

 public:

     NHcfg();

     virtual ~NHcfg();

 

     bool load(const QString&);

     const tentrylist&fixDates()const;

     const tentrylist&floatingDates()const;

 

     virtual bool warning(const QXmlParseException& e);

     virtual bool error(const QXmlParseException& e);

     virtual bool fatalError(const QXmlParseException& e);

     virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr);

     virtual bool endElement(const QString&, const QString&,const QString& name);

-    virtual const QString&errorString()const;

+    virtual QString errorString()const;

 

 protected:

     QString err,_contentname;

     QString _path;

 

     NHentry m_currentEntry;

 

     bool setName(const QXmlAttributes&);

     bool parsevalue(const QString&,const QXmlAttributes&);

     bool parseCalc(const QString&,const QXmlAttributes&);

     int stage,counter,level;

     tentrylist currentFloatList,currentFixList;

 };

 

 #endif