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

fix the enums and typos

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-02-12 16:00:18 +02:00
parent 399bd464db
commit 82ce5394da
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
declarativeimports/locale/calendarsystem.cpp
View File

@ -163,13 +163,13 @@ int CalendarSystem::day(const QDate &date) const
// NOT VIRTUAL - If override needed use shared-d
QString CalendarSystem::eraName(const QDate &date, StringFormat format) const
{
return m_calendarSystem->eraName(date, format);
return m_calendarSystem->eraName(date, (KCalendarSystem::StringFormat)format);
}
// NOT VIRTUAL - If override needed use shared-d
QString CalendarSystem::eraYear(const QDate &date, StringFormat format) const
{
return m_calendarSystem->eraYear(date, format);
return m_calendarSystem->eraYear(date, (KCalendarSystem::StringFormat)format);
}
// NOT VIRTUAL - If override needed use shared-d
@ -301,7 +301,7 @@ int CalendarSystem::daysInMonth(int year, int month) const
int CalendarSystem::daysInWeek(const QDate &date) const
{
return m_calendarSystem->daysInWeek();
return m_calendarSystem->daysInWeek(date);
}
int CalendarSystem::dayOfYear(const QDate &date) const
@ -314,11 +314,6 @@ int CalendarSystem::dayOfWeek(const QDate &date) const
return m_calendarSystem->dayOfWeek(date);
}
int CalendarSystem::weekNumber(const QDate &date, int *yearNum) const
{
return week(date, Locale::IsoWeekNumber, yearNum);
}
// NOT VIRTUAL - Uses shared-d instead
int CalendarSystem::week(const QDate &date, int *yearNum) const
{
@ -418,7 +413,7 @@ QString CalendarSystem::formatDate(const QDate &fromDate, Locale::DateFormat toF
QString CalendarSystem::formatDate(const QDate &fromDate, const QString &toFormat,
Locale::DateTimeFormatStandard standard) const
{
return m_calendarSystem->formatDate(fromDate, toFormat, (KLocale::DateTimeFormatStandard)standar);
return m_calendarSystem->formatDate(fromDate, toFormat, (KLocale::DateTimeFormatStandard)standard);
}
// NOT VIRTUAL - If override needed use shared-d