alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the era* internal methods

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-02-12 16:14:18 +02:00
parent 55ff7f3e0b
commit fbb91918de
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
declarativeimports/locale/calendarsystem.cpp
View File

@ -22,12 +22,9 @@
#include "kdebug.h" #include "kdebug.h"
#include "kconfiggroup.h" #include "kconfiggroup.h"
#include <KCalendarSystem> #include <KCalendarSystem>
#include <QtCore/QDateTime>
#include <KDateTime> #include <KDateTime>
//FIXME fix all the create static methods #include <QtCore/QDateTime>
QList<Locale::CalendarSystem> CalendarSystem::calendarSystemsList() QList<Locale::CalendarSystem> CalendarSystem::calendarSystemsList()
{ {
@ -178,32 +175,6 @@ int CalendarSystem::yearInEra(const QDate &date) const
return m_calendarSystem->yearInEra(date); return m_calendarSystem->yearInEra(date);
} }
// NOT VIRTUAL - If override needed use shared-d
//FIXME we need a wrapper for KCalendarEra!!
/*QList<KCalendarEra> *CalendarSystem::eraList() const
{
Q_D(const KCalendarSystem);
return d->eraList();
}*/
// NOT VIRTUAL - If override needed use shared-d
/*FIXME we don't need the above.Correct?
KCalendarEra CalendarSystem::era(const QDate &eraDate) const
{
Q_D(const KCalendarSystem);
return d->era(eraDate);
}
// NOT VIRTUAL - If override needed use shared-d
KCalendarEra CalendarSystem::era(const QString &eraName, int yearInEra) const
{
Q_D(const KCalendarSystem);
return d->era(eraName, yearInEra);
}
*/
QDate CalendarSystem::addYears(const QDate &date, int numYears) const QDate CalendarSystem::addYears(const QDate &date, int numYears) const
{ {
return m_calendarSystem->addYears(date, numYears); return m_calendarSystem->addYears(date, numYears);

6
declarativeimports/locale/calendarsystem.h
View File

@ -1147,12 +1147,6 @@ public:
Q_INVOKABLE virtual bool isProleptic() const = 0; Q_INVOKABLE virtual bool isProleptic() const = 0;
private: private:
//FIXME era issue..
// Era functions needed by friends, may be made public later if needed in KCM
QList<KCalendarEra> *eraList() const;
KCalendarEra era(const QDate &eraDate) const;
KCalendarEra era(const QString &eraName, int yearInEra) const;
KCalendarSystem *m_calendarSystem; KCalendarSystem *m_calendarSystem;
}; };