summaryrefslogtreecommitdiff
authorerik <erik>2007-01-11 22:29:59 (UTC)
committer erik <erik>2007-01-11 22:29:59 (UTC)
commitc0145131ff669a911d51cd0a2b5d3471bf150eb0 (patch) (unidiff)
tree6350f62cbb85618dccc5523ff5607a9b703c6b95
parenta42e428100b27bd7ee2d191abbe231edfbd61e00 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/holiday/national/nationalcfg.cpp2
-rw-r--r--core/pim/datebook/holiday/national/nationalcfg.h2
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
@@ -273,13 +273,13 @@ bool NHcfg::endElement(const QString&, const QString&,const QString& name)
273 --level; 273 --level;
274 } 274 }
275// odebug << "Level == " << level << oendl; 275// odebug << "Level == " << level << oendl;
276 return true; 276 return true;
277} 277}
278 278
279QString NHcfg::errorString() const 279QString NHcfg::errorString()
280{ 280{
281 return err; 281 return err;
282} 282}
283 283
284NHentry::NHentry() 284NHentry::NHentry()
285 :m_Type(fix) 285 :m_Type(fix)
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
@@ -54,13 +54,13 @@ public:
54 54
55 virtual bool warning(const QXmlParseException& e); 55 virtual bool warning(const QXmlParseException& e);
56 virtual bool error(const QXmlParseException& e); 56 virtual bool error(const QXmlParseException& e);
57 virtual bool fatalError(const QXmlParseException& e); 57 virtual bool fatalError(const QXmlParseException& e);
58 virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr); 58 virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr);
59 virtual bool endElement(const QString&, const QString&,const QString& name); 59 virtual bool endElement(const QString&, const QString&,const QString& name);
60 virtual QString errorString()const; 60 virtual QString errorString();
61 61
62protected: 62protected:
63 QString err,_contentname; 63 QString err,_contentname;
64 QString _path; 64 QString _path;
65 65
66 NHentry m_currentEntry; 66 NHentry m_currentEntry;