author | erik <erik> | 2007-01-11 22:29:59 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-11 22:29:59 (UTC) |
commit | c0145131ff669a911d51cd0a2b5d3471bf150eb0 (patch) (side-by-side diff) | |
tree | 6350f62cbb85618dccc5523ff5607a9b703c6b95 /core/pim | |
parent | a42e428100b27bd7ee2d191abbe231edfbd61e00 (diff) | |
download | opie-c0145131ff669a911d51cd0a2b5d3471bf150eb0.zip opie-c0145131ff669a911d51cd0a2b5d3471bf150eb0.tar.gz opie-c0145131ff669a911d51cd0a2b5d3471bf150eb0.tar.bz2 |
I missed a bad override signature. This fixes that. There should be no
class inheritance function mismatches at this point.
-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.h | 2 |
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 33e9db3..5e8ec29 100644 --- a/core/pim/datebook/holiday/national/nationalcfg.cpp +++ b/core/pim/datebook/holiday/national/nationalcfg.cpp @@ -267,25 +267,25 @@ bool NHcfg::endElement(const QString&, const QString&,const QString& name) // odebug << "Floatlist count " << currentFloatList.count() << oendl;
}
} else if (name==_key_calc) {
}
if (stage>=3) {
--level;
}
// odebug << "Level == " << level << oendl;
return true;
}
-QString NHcfg::errorString() const
+QString NHcfg::errorString()
{
return err;
}
NHentry::NHentry()
:m_Type(fix)
{
m_Offset=0;
}
NHentry::~NHentry()
{}
diff --git a/core/pim/datebook/holiday/national/nationalcfg.h b/core/pim/datebook/holiday/national/nationalcfg.h index 2aedd95..28e1fdd 100644 --- a/core/pim/datebook/holiday/national/nationalcfg.h +++ b/core/pim/datebook/holiday/national/nationalcfg.h @@ -48,25 +48,25 @@ 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 QString errorString()const;
+ virtual QString errorString();
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;
|