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

Fix a typo,remove a deprecated method add comment the Locale::calendar

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-02-14 12:52:08 +02:00
parent 7877980f2e
commit 6b784a98e8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/locale/locale.cpp
View File

@ -641,10 +641,10 @@ Locale::CalendarSystem Locale::calendarSystem() const
return (Locale::CalendarSystem)m_locale->calendarSystem(); return (Locale::CalendarSystem)m_locale->calendarSystem();
} }
const KCalendarSystem * Locale::calendar() const /*const KCalendarSystem * Locale::calendar() const
{ {
return m_locale->calendar(); return m_locale->calendar();
} }*/
void Locale::setWeekNumberSystem(Locale::WeekNumberSystem weekNumberSystem) void Locale::setWeekNumberSystem(Locale::WeekNumberSystem weekNumberSystem)
{ {

11
declarativeimports/locale/locale.h
View File

@ -84,8 +84,7 @@ Q_ENUMS(WeekNumberSystem)
//properties //properties
Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged) Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged)
Q_PROPERTY(KCalendarSystem *calendar READ calendar WRITE setCalendar NOTIFY calendarChanged) Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged)
Q_PROPERTY(Locale::CalendarSystem *calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged)
Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged) Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
Q_PROPERTY(QString countryDivisionCode READ countryDivisionCode WRITE setCountryDivisionCode NOTIFY countryDivisionCodeChanged) Q_PROPERTY(QString countryDivisionCode READ countryDivisionCode WRITE setCountryDivisionCode NOTIFY countryDivisionCodeChanged)
Q_PROPERTY(QString currencyCode READ currencyCode WRITE setCurrencyCode NOTIFY currencyCodeChanged) Q_PROPERTY(QString currencyCode READ currencyCode WRITE setCurrencyCode NOTIFY currencyCodeChanged)
@ -1054,12 +1053,17 @@ public:
*/ */
int weekDayOfPray() const; int weekDayOfPray() const;
/**
* What should I do with the above?
* It won't work in QML.
**/
/** /**
* Returns a pointer to the calendar system object. * Returns a pointer to the calendar system object.
* *
* @return the current calendar system instance * @return the current calendar system instance
*/ */
const KCalendarSystem * calendar() const; //const KCalendarSystem * calendar() const;
/** /**
* *
@ -2017,7 +2021,6 @@ Q_SIGNALS:
void weekStartDayChanged(); void weekStartDayChanged();
void workingWeekEndDayChanged(); void workingWeekEndDayChanged();
void workingWeekStartDayChanged(); void workingWeekStartDayChanged();
void calendarChanged();
}; };
//TODO remove the above? //TODO remove the above?
//Q_DECLARE_OPERATORS_FOR_FLAGS(Locale::DateTimeFormatOptions) //Q_DECLARE_OPERATORS_FOR_FLAGS(Locale::DateTimeFormatOptions)