From 23457bd6d9d54df2cab505e581e72f9942b0fdbb Mon Sep 17 00:00:00 2001 From: John Layt Date: Fri, 27 Jan 2012 20:21:21 +0000 Subject: SIC: QLocale: Make QSystemLocale a private class As discussed on list and approved by Lars and Thiago. Make QSystemLocale private to give us time and space to change it to a better implementation. Change-Id: Ifd806972f3996c43a876f544f78c6557ad71cd75 Reviewed-by: Lars Knoll --- src/corelib/tools/qlocale.h | 69 ------------------------------------------ src/corelib/tools/qlocale.qdoc | 1 + src/corelib/tools/qlocale_p.h | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 2255340b67..c029f627b2 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -61,71 +61,6 @@ class QTextStreamPrivate; class QLocale; -#ifndef QT_NO_SYSTEMLOCALE -class Q_CORE_EXPORT QSystemLocale -{ -public: - QSystemLocale(); - virtual ~QSystemLocale(); - - struct CurrencyToStringArgument - { - CurrencyToStringArgument() { } - CurrencyToStringArgument(const QVariant &v, const QString &s) - : value(v), symbol(s) { } - QVariant value; - QString symbol; - }; - - enum QueryType { - LanguageId, // uint - CountryId, // uint - DecimalPoint, // QString - GroupSeparator, // QString - ZeroDigit, // QString - NegativeSign, // QString - DateFormatLong, // QString - DateFormatShort, // QString - TimeFormatLong, // QString - TimeFormatShort, // QString - DayNameLong, // QString, in: int - DayNameShort, // QString, in: int - MonthNameLong, // QString, in: int - MonthNameShort, // QString, in: int - DateToStringLong, // QString, in: QDate - DateToStringShort, // QString in: QDate - TimeToStringLong, // QString in: QTime - TimeToStringShort, // QString in: QTime - DateTimeFormatLong, // QString - DateTimeFormatShort, // QString - DateTimeToStringLong, // QString in: QDateTime - DateTimeToStringShort, // QString in: QDateTime - MeasurementSystem, // uint - PositiveSign, // QString - AMText, // QString - PMText, // QString - FirstDayOfWeek, // Qt::DayOfWeek - Weekdays, // QList - CurrencySymbol, // QString in: CurrencyToStringArgument - CurrencyToString, // QString in: qlonglong, qulonglong or double - UILanguages, // QStringList - StringToStandardQuotation, // QString in: QStringRef to quote - StringToAlternateQuotation, // QString in: QStringRef to quote - ScriptId, // uint - ListToSeparatedString, // QString - LocaleChanged, // system locale changed - NativeLanguageName, // QString - NativeCountryName // QString - }; - virtual QVariant query(QueryType type, QVariant in) const; - virtual QLocale fallbackLocale() const; - -private: - QSystemLocale(bool); - friend QSystemLocale *QSystemLocale_globalSystemLocale(); -}; -#endif - struct QLocalePrivate; class Q_CORE_EXPORT QLocale { @@ -811,10 +746,6 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QLocale &); QT_END_NAMESPACE -#ifndef QT_NO_SYSTEMLOCALE -Q_DECLARE_METATYPE(QSystemLocale::CurrencyToStringArgument) -#endif - QT_END_HEADER #endif // QLOCALE_H diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index 65cdc4d7ff..cc335a4575 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -711,6 +711,7 @@ */ /*! + \internal \class QSystemLocale \brief The QSystemLocale class can be used to finetune the system locale of the user. diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 849df26c4c..7653f4d93d 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -61,6 +61,71 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_SYSTEMLOCALE +class QSystemLocale +{ +public: + QSystemLocale(); + virtual ~QSystemLocale(); + + struct CurrencyToStringArgument + { + CurrencyToStringArgument() { } + CurrencyToStringArgument(const QVariant &v, const QString &s) + : value(v), symbol(s) { } + QVariant value; + QString symbol; + }; + + enum QueryType { + LanguageId, // uint + CountryId, // uint + DecimalPoint, // QString + GroupSeparator, // QString + ZeroDigit, // QString + NegativeSign, // QString + DateFormatLong, // QString + DateFormatShort, // QString + TimeFormatLong, // QString + TimeFormatShort, // QString + DayNameLong, // QString, in: int + DayNameShort, // QString, in: int + MonthNameLong, // QString, in: int + MonthNameShort, // QString, in: int + DateToStringLong, // QString, in: QDate + DateToStringShort, // QString in: QDate + TimeToStringLong, // QString in: QTime + TimeToStringShort, // QString in: QTime + DateTimeFormatLong, // QString + DateTimeFormatShort, // QString + DateTimeToStringLong, // QString in: QDateTime + DateTimeToStringShort, // QString in: QDateTime + MeasurementSystem, // uint + PositiveSign, // QString + AMText, // QString + PMText, // QString + FirstDayOfWeek, // Qt::DayOfWeek + Weekdays, // QList + CurrencySymbol, // QString in: CurrencyToStringArgument + CurrencyToString, // QString in: qlonglong, qulonglong or double + UILanguages, // QStringList + StringToStandardQuotation, // QString in: QStringRef to quote + StringToAlternateQuotation, // QString in: QStringRef to quote + ScriptId, // uint + ListToSeparatedString, // QString + LocaleChanged, // system locale changed + NativeLanguageName, // QString + NativeCountryName // QString + }; + virtual QVariant query(QueryType type, QVariant in) const; + virtual QLocale fallbackLocale() const; + +private: + QSystemLocale(bool); + friend QSystemLocale *QSystemLocale_globalSystemLocale(); +}; +#endif + struct Q_CORE_EXPORT QLocalePrivate { public: @@ -261,5 +326,8 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QStringRef) Q_DECLARE_METATYPE(QList) +#ifndef QT_NO_SYSTEMLOCALE +Q_DECLARE_METATYPE(QSystemLocale::CurrencyToStringArgument) +#endif #endif // QLOCALE_P_H -- cgit v1.2.3