Remove the signals and make the properties constants

This commit is contained in:
Giorgos Tsiapaliwkas 2012-04-13 19:51:07 +03:00
parent 0e702d85f5
commit d1f8e46a3e
3 changed files with 26 additions and 140 deletions

View File

@ -43,18 +43,18 @@ Q_ENUMS(DateTimeComponent)
Q_ENUMS(DateTimeComponentFormat)
//properties
Q_PROPERTY(QList<int> calendarSystemsList READ calendarSystemsList) //read-only
Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem NOTIFY calendarSystemChanged)//read-only
Q_PROPERTY(QString calendarLabel READ calendarLabel NOTIFY calendarLabelChanged)//read-only
Q_PROPERTY(QDate epoch READ epoch NOTIFY epochChanged)//read-only
Q_PROPERTY(QDate earliestValidDate READ earliestValidDate NOTIFY earliestValidDateChanged)//read-only
Q_PROPERTY(QDate latestValidDate READ latestValidDate NOTIFY latestValidDateChanged)//read-only
Q_PROPERTY(int shortYearWindowStartYear READ shortYearWindowStartYear NOTIFY shortYearWindowStartYearChanged)
Q_PROPERTY(int weekStartDay READ weekStartDay NOTIFY weekStartDayChanged)//read-only
Q_PROPERTY(bool isLunar READ isLunar NOTIFY isLunarChanged)//read-only
Q_PROPERTY(bool isLunisolar READ isLunisolar NOTIFY isLunisolarChanged)//read-only
Q_PROPERTY(bool isSolar READ isSolar NOTIFY isSolarChanged)//read-only
Q_PROPERTY(bool isProleptic READ isProleptic NOTIFY isProlepticChanged)//read-only
Q_PROPERTY(QList<int> calendarSystemsList READ calendarSystemsList CONSTANT) //read-only
Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem CONSTANT)//read-only
Q_PROPERTY(QString calendarLabel READ calendarLabel CONSTANT)//read-only
Q_PROPERTY(QDate epoch READ epoch CONSTANT)//read-only
Q_PROPERTY(QDate earliestValidDate READ earliestValidDate CONSTANT)//read-only
Q_PROPERTY(QDate latestValidDate READ latestValidDate CONSTANT)//read-only
Q_PROPERTY(int shortYearWindowStartYear READ shortYearWindowStartYear CONSTANT)
Q_PROPERTY(int weekStartDay READ weekStartDay CONSTANT)//read-only
Q_PROPERTY(bool isLunar READ isLunar CONSTANT)//read-only
Q_PROPERTY(bool isLunisolar READ isLunisolar CONSTANT)//read-only
Q_PROPERTY(bool isSolar READ isSolar CONSTANT)//read-only
Q_PROPERTY(bool isProleptic READ isProleptic CONSTANT)//read-only
public:
@ -690,19 +690,6 @@ public:
*/
bool isProleptic() const;
Q_SIGNALS:
void calendarSystemChanged();
void calendarLabelChanged();
void epochChanged();
void earliestValidDateChanged();
void latestValidDateChanged();
void shortYearWindowStartYearChanged();
void weekStartDayChanged();
void isLunarChanged();
void isLunisolarChanged();
void isSolarChanged();
void isProlepticChanged();
private:
KCalendarSystem *m_calendarSystem;
};

View File

@ -81,7 +81,7 @@ Q_ENUMS(WeekNumberSystem)
//properties
Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged)
Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged)
Q_PROPERTY(QString country READ country NOTIFY countryChanged) //read-only
Q_PROPERTY(QString country READ country CONSTANT) //read-only
Q_PROPERTY(QString countryDivisionCode READ countryDivisionCode WRITE setCountryDivisionCode NOTIFY countryDivisionCodeChanged)
Q_PROPERTY(QString currencyCode READ currencyCode WRITE setCurrencyCode NOTIFY currencyCodeChanged)
Q_PROPERTY(QString currencySymbol READ currencySymbol WRITE setCurrencySymbol NOTIFY currencySymbolChanged)
@ -92,7 +92,7 @@ Q_PROPERTY(DigitSet dateTimeDigitSet READ dateTimeDigitSet WRITE setDateTimeDigi
Q_PROPERTY(int decimalPlaces READ decimalPlaces WRITE setDecimalPlaces NOTIFY decimalPlacesChanged)
Q_PROPERTY(QString decimalSymbol READ decimalSymbol WRITE setDecimalSymbol NOTIFY decimalSymbolChanged)
Q_PROPERTY(DigitSet digitSet READ digitSet WRITE setDigitSet NOTIFY digitSetChanged)
Q_PROPERTY(QString language READ language NOTIFY languageChanged) //read-only
Q_PROPERTY(QString language READ language CONSTANT) //read-only
Q_PROPERTY(MeasureSystem measureSystem READ measureSystem WRITE setMeasureSystem NOTIFY measureSystemChanged)
Q_PROPERTY(int monetaryDecimalPlaces READ monetaryDecimalPlaces WRITE setMonetaryDecimalPlaces NOTIFY monetaryDecimalPlacesChanged)
Q_PROPERTY(QString monetaryDecimalSymbol READ monetaryDecimalSymbol WRITE setMonetaryDecimalSymbol NOTIFY monetaryDecimalSymbolChanged)
@ -111,18 +111,18 @@ Q_PROPERTY(Locale::WeekNumberSystem weekNumberSystem READ weekNumberSystem WRITE
Q_PROPERTY(int weekStartDay READ weekStartDay WRITE setWeekStartDay NOTIFY weekStartDayChanged)
Q_PROPERTY(int workingWeekEndDay READ workingWeekEndDay WRITE setWorkingWeekEndDay NOTIFY workingWeekEndDayChanged)
Q_PROPERTY(int workingWeekStartDay READ workingWeekStartDay WRITE setWorkingWeekStartDay NOTIFY workingWeekStartDayChanged)
Q_PROPERTY(bool use12Clock READ use12Clock NOTIFY use12ClockChanged)
Q_PROPERTY(QString defaultLanguage READ defaultLanguage NOTIFY defaultLanguageChanged)//read-only
Q_PROPERTY(QString defaultCountry READ defaultCountry NOTIFY defaultCountryChanged)//read-only
Q_PROPERTY(QString defaultCurrencyCode READ defaultCurrencyCode NOTIFY defaultCurrencyCodeChanged)//read-only
Q_PROPERTY(bool useTranscript READ useTranscript NOTIFY useTranscriptChanged) //read-only
Q_PROPERTY(int fileEncodingMib READ fileEncodingMib NOTIFY fileEncodingMibChanged) //read-only
Q_PROPERTY(QStringList languageList READ languageList NOTIFY languageListChanged) //read-only
Q_PROPERTY(QStringList currencyCodeList READ currencyCodeList NOTIFY currencyCodeListChanged) //read-only
Q_PROPERTY(QStringList allLanguagesList READ allLanguagesList NOTIFY allLanguagesListChanged) //read-only
Q_PROPERTY(QStringList installedLanguages READ installedLanguages NOTIFY installedLanguagesChanged) //read-only
Q_PROPERTY(QStringList allCountriesList READ allCountriesList NOTIFY allCountriesListChanged) //read-only
Q_PROPERTY(QList<int> allDigitSetsList READ allDigitSetsList NOTIFY allDigitSetsListChanged) //read-only
Q_PROPERTY(bool use12Clock READ use12Clock CONSTANT)
Q_PROPERTY(QString defaultLanguage READ defaultLanguage CONSTANT)//read-only
Q_PROPERTY(QString defaultCountry READ defaultCountry CONSTANT)//read-only
Q_PROPERTY(QString defaultCurrencyCode READ defaultCurrencyCode CONSTANT)//read-only
Q_PROPERTY(bool useTranscript READ useTranscript CONSTANT) //read-only
Q_PROPERTY(int fileEncodingMib READ fileEncodingMib CONSTANT) //read-only
Q_PROPERTY(QStringList languageList READ languageList CONSTANT) //read-only
Q_PROPERTY(QStringList currencyCodeList READ currencyCodeList CONSTANT) //read-only
Q_PROPERTY(QStringList allLanguagesList READ allLanguagesList CONSTANT) //read-only
Q_PROPERTY(QStringList installedLanguages READ installedLanguages CONSTANT) //read-only
Q_PROPERTY(QStringList allCountriesList READ allCountriesList CONSTANT) //read-only
Q_PROPERTY(QList<int> allDigitSetsList READ allDigitSetsList CONSTANT) //read-only
public:
/**
@ -1604,7 +1604,6 @@ private:
Q_SIGNALS:
void binaryUnitDialectChanged();
void calendarSystemChanged();
void countryChanged();
void countryDivisionCodeChanged();
void currencyCodeChanged();
void decimalSymbolChanged();
@ -1615,7 +1614,6 @@ Q_SIGNALS:
void dateTimeDigitSetChanged();
void decimalPlacesChanged();
void digitSetChanged();
void languageChanged();
void measureSystemChanged();
void monetaryDecimalPlacesChanged();
void monetaryDecimalSymbolChanged();
@ -1635,18 +1633,6 @@ Q_SIGNALS:
void weekStartDayChanged();
void workingWeekEndDayChanged();
void workingWeekStartDayChanged();
void use12ClockChanged();
void defaultCountryChanged();
void defaultCurrencyCodeChanged();
void defaultLanguageChanged();
void useTranscriptChanged();
void fileEncodingMibChanged();
void languageListChanged();
void currencyCodeListChanged();
void allLanguagesListChanged();
void installedLanguagesChanged();
void allCountriesListChanged();
void allDigitSetsListChanged();
};
#endif

View File

@ -475,97 +475,10 @@ Item {
onWorkingWeekStartDayChanged: {
console.log("the workingWeekStartDay property has been changed")
}
onUse12ClockChanged: {
console.log("the use12Clock property has been changed")
}
onDefaultLanguageChanged: {
console.log("the defaultLanguage property has been changed")
}
onDefaultCountryChanged: {
console.log("the defaultCountry property has been changed")
}
onDefaultCurrencyCodeChanged: {
console.log("the defaultCurrencyCode property has been changed")
}
onUseTranscriptChanged: {
console.log("the useTranscript property has been changed")
}
onCountryChanged: {
console.log("the country property has been changed")
}
onLanguageChanged: {
console.log("the language property has been changed")
}
onFileEncodingMibChanged: {
console.log("the fileEncodingMib property has been changed")
}
onLanguageListChanged: {
console.log("the languageList property has been changed")
}
onCurrencyCodeListChanged: {
console.log("the currencyCodeList property has been changed")
}
onInstalledLanguagesChanged: {
console.log("the installedLanguages property has been changed")
}
onAllCountriesListChanged: {
console.log("the allCountriesList property has been changed")
}
onAllDigitSetsListChanged: {
console.log("the allDigitSetsList property has been changed")
}
}
CalendarSystem {
id: calendar
onCalendarSystemChanged: {
console.log("the calendarSystem property has been changed")
}
onCalendarLabelChanged: {
console.log("the calendarLabel property has been changed")
}
onEpochChanged: {
console.log("the epoch property has been changed")
}
onEarliestValidDateChanged: {
console.log("the earliestValidDate property has been changed")
}
onLatestValidDateChanged: {
console.log("the latestValidDate property has been changed")
}
onShortYearWindowStartYearChanged: {
console.log("the shortYearWindowStartYear property has been changed")
}
onWeekStartDayChanged: {
console.log("the weekStartDay property has been changed")
}
onIsLunarChanged: {
console.log("the isLunar property has been changed")
}
onIsLunisolarChanged: {
console.log("the isLunisolar property has been changed")
}
onIsSolarChanged: {
console.log("the isSolar property has been changed")
}
onIsProlepticChanged: {
console.log("the isProleptic property has been changed")
}
}
}
}