From 241886c1393656d9a109a46342fd4371e60ad138 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 13 Sep 2013 09:23:48 +0200 Subject: Doc: Move properties of Locale QML type to correct module Moves property and method documentation for QML Locale type from Qt Quick to Qt Qml module, and fix a number of broken links in locale-related docs. Change-Id: Id9e01314ea867987f5159ca3bffcc40abb27b289 Reviewed-by: Mitch Curtis --- src/qml/doc/src/javascript/date.qdoc | 2 +- src/qml/doc/src/javascript/number.qdoc | 2 +- src/qml/qml/qqmllocale.cpp | 58 ++++++++++++++++----------------- src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 +- src/quick/items/qquicktextinput.cpp | 4 +-- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc index 085d988377..d4eeede8eb 100644 --- a/src/qml/doc/src/javascript/date.qdoc +++ b/src/qml/doc/src/javascript/date.qdoc @@ -132,7 +132,7 @@ hour, if DST is currently in effect, while it was not for the time specified, or vice versa. - \sa {QtQuick2::Locale}{Locale} + \sa {QtQml2::Locale}{Locale} */ /*! diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc index 20fe40c86f..fa56f71925 100644 --- a/src/qml/doc/src/javascript/number.qdoc +++ b/src/qml/doc/src/javascript/number.qdoc @@ -33,7 +33,7 @@ The QML Number object extends the JS Number object with locale aware functions. - \sa {QtQuick2::Locale}{Locale} + \sa {QtQml2::Locale}{Locale} */ /*! diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 194a5ca7e7..f3061e6e18 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -857,7 +857,7 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data); This product includes software developed by the University of California, Berkeley and its contributors. - \sa {QtQuick2::Date}{Date}, {QtQuick2::Number}{Number} + \sa Date, Number */ QQmlLocale::QQmlLocale() @@ -913,7 +913,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) } /*! - \qmlproperty string QtQuick2::Locale::name + \qmlproperty string QtQml2::Locale::name Holds the language and country of this locale as a string of the form "language_country", where @@ -922,77 +922,77 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty string QtQuick2::Locale::decimalPoint + \qmlproperty string QtQml2::Locale::decimalPoint Holds the decimal point character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::groupSeparator + \qmlproperty string QtQml2::Locale::groupSeparator Holds the group separator character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::percent + \qmlproperty string QtQml2::Locale::percent Holds the percent character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::zeroDigit + \qmlproperty string QtQml2::Locale::zeroDigit Holds Returns the zero digit character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::negativeSign + \qmlproperty string QtQml2::Locale::negativeSign Holds the negative sign character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::positiveSign + \qmlproperty string QtQml2::Locale::positiveSign Holds the positive sign character of this locale. */ /*! - \qmlproperty string QtQuick2::Locale::exponential + \qmlproperty string QtQml2::Locale::exponential Holds the exponential character of this locale. */ /*! - \qmlmethod string QtQuick2::Locale::dateTimeFormat(type) + \qmlmethod string QtQml2::Locale::dateTimeFormat(type) Returns the date time format used for the current locale. \a type specifies the FormatType to return. - \sa {QtQuick2::Date}{Date} + \sa Date */ /*! - \qmlmethod string QtQuick2::Locale::dateFormat(type) + \qmlmethod string QtQml2::Locale::dateFormat(type) Returns the date format used for the current locale. \a type specifies the FormatType to return. - \sa {QtQuick2::Date}{Date} + \sa Date */ /*! - \qmlmethod string QtQuick2::Locale::timeFormat(type) + \qmlmethod string QtQml2::Locale::timeFormat(type) Returns the time format used for the current locale. \a type specifies the FormatType to return. - \sa {QtQuick2::Date}{Date} + \sa Date */ /*! - \qmlmethod string QtQuick2::Locale::monthName(month, type) + \qmlmethod string QtQml2::Locale::monthName(month, type) Returns the localized name of \a month (0-11), in the optional \l FormatType specified by \a type. @@ -1004,7 +1004,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlmethod string QtQuick2::Locale::standaloneMonthName(month, type) + \qmlmethod string QtQml2::Locale::standaloneMonthName(month, type) Returns the localized name of \a month (0-11) that is used as a standalone text, in the optional \l FormatType specified by \a type. @@ -1019,7 +1019,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlmethod string QtQuick2::Locale::dayName(day, type) + \qmlmethod string QtQml2::Locale::dayName(day, type) Returns the localized name of the \a day (where 0 represents Sunday, 1 represents Monday and so on), in the optional @@ -1029,7 +1029,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlmethod string QtQuick2::Locale::standaloneDayName(day, type) + \qmlmethod string QtQml2::Locale::standaloneDayName(day, type) Returns the localized name of the \a day (where 0 represents Sunday, 1 represents Monday and so on) that is used as a @@ -1042,7 +1042,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty enumeration QtQuick2::Locale::firstDayOfWeek + \qmlproperty enumeration QtQml2::Locale::firstDayOfWeek Holds the first day of the week according to the current locale. @@ -1061,7 +1061,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty Array QtQuick2::Locale::weekDays + \qmlproperty Array QtQml2::Locale::weekDays Holds an array of days that are considered week days according to the current locale, where Sunday is 0 and Saturday is 6. @@ -1070,7 +1070,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty Array QtQuick2::Locale::uiLanguages + \qmlproperty Array QtQml2::Locale::uiLanguages Returns an ordered list of locale names for translation purposes in preference order. @@ -1082,7 +1082,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty enumeration QtQuick2::Locale::textDirection + \qmlproperty enumeration QtQml2::Locale::textDirection Holds the text direction of the language: \list @@ -1092,19 +1092,19 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty string QtQuick2::Locale::amText + \qmlproperty string QtQml2::Locale::amText The localized name of the "AM" suffix for times specified using the conventions of the 12-hour clock. */ /*! - \qmlproperty string QtQuick2::Locale::pmText + \qmlproperty string QtQml2::Locale::pmText The localized name of the "PM" suffix for times specified using the conventions of the 12-hour clock. */ /*! - \qmlmethod string QtQuick2::Locale::currencySymbol(format) + \qmlmethod string QtQml2::Locale::currencySymbol(format) Returns the currency symbol for the specified \a format: \list @@ -1116,7 +1116,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty string QtQuick2::Locale::nativeLanguageName + \qmlproperty string QtQml2::Locale::nativeLanguageName Holds a native name of the language for the locale. For example "Schwiizertüütsch" for Swiss-German locale. @@ -1125,7 +1125,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty string QtQuick2::Locale::nativeCountryName + \qmlproperty string QtQml2::Locale::nativeCountryName Holds a native name of the country for the locale. For example "España" for Spanish/Spain locale. @@ -1134,7 +1134,7 @@ v8::Handle QQmlLocale::localeCompare(const v8::Arguments &args) */ /*! - \qmlproperty enumeration QtQuick2::Locale::measurementSystem + \qmlproperty enumeration QtQml2::Locale::measurementSystem This property defines which units are used for measurement. diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 457d0bb969..a71efbb62f 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1577,7 +1577,7 @@ v8::Handle qsTrIdNoOp(const v8::Arguments &args) is not present, or is not a valid ISO 3166 code, the most appropriate country is chosen for the specified language. - \sa QtQuick2::Locale + \sa {QtQml2::Locale}{Locale} */ v8::Handle locale(const v8::Arguments &args) { diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 9a311895f6..72e09496c0 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -929,7 +929,7 @@ QQuickIntValidator::QQuickIntValidator(QObject *parent) This property holds the name of the locale used to interpret the number. - \sa QML:Qt::locale() + \sa {QtQml2::Qt::locale()}{Qt.locale()} */ QString QQuickIntValidator::localeName() const @@ -1004,7 +1004,7 @@ QQuickDoubleValidator::QQuickDoubleValidator(QObject *parent) This property holds the name of the locale used to interpret the number. - \sa QML:Qt::locale() + \sa {QtQml2::Qt::locale()}{Qt.locale()} */ QString QQuickDoubleValidator::localeName() const -- cgit v1.2.3