Remove the methods translateRawFrom. In the documentation
we are being advised not to use them directly, the same applies for QML.
This commit is contained in:
Giorgos Tsiapaliwkas
parent
0343a25c8f
commit
58bf5c9c8e
@ -87,30 +87,6 @@ void Locale::setActiveCatalog(const QString &catalog)
|
|||||||
m_locale->setActiveCatalog(catalog);
|
m_locale->setActiveCatalog(catalog);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Locale::translateRawFrom(const char *catname, const char *ctxt, const char *singular, const char *plural,
|
|
||||||
unsigned long n, QString *lang, QString *trans) const
|
|
||||||
{
|
|
||||||
m_locale->translateRawFrom(catname, ctxt, singular, plural, n, lang, trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Convenience versions
|
|
||||||
void Locale::translateRawFrom(const char *catname, const char *msg, QString *lang, QString *trans) const
|
|
||||||
{
|
|
||||||
m_locale->translateRawFrom(catname, 0, msg, 0, 0, lang, trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Locale::translateRawFrom(const char *catname, const char *ctxt, const char *msg, QString *lang,
|
|
||||||
QString *trans) const
|
|
||||||
{
|
|
||||||
m_locale->translateRawFrom(catname, ctxt, msg, 0, 0, lang, trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Locale::translateRawFrom(const char *catname, const char *singular, const char *plural,
|
|
||||||
unsigned long n, QString *lang, QString *trans) const
|
|
||||||
{
|
|
||||||
m_locale->translateRawFrom(catname, 0, singular, plural, n, lang, trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString Locale::translateQt(const char *context, const char *sourceText, const char *comment) const
|
QString Locale::translateQt(const char *context, const char *sourceText, const char *comment) const
|
||||||
{
|
{
|
||||||
return m_locale->translateQt(context, sourceText, comment);
|
return m_locale->translateQt(context, sourceText, comment);
|
||||||
|
|||||||
@ -127,108 +127,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
Locale(QObject *parent = 0);
|
Locale(QObject *parent = 0);
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Raw translation from a message catalog.
|
|
||||||
* If catalog name is null or empty,
|
|
||||||
* all loaded catalogs are searched for the translation.
|
|
||||||
*
|
|
||||||
* Never use this directly to get message translations. See the i18n and ki18n
|
|
||||||
* family of calls related to KLocalizedString.
|
|
||||||
*
|
|
||||||
* @param catname the catalog name. Must be UTF-8 encoded.
|
|
||||||
* @param msg the message. Must not be null or empty. Must be UTF-8 encoded.
|
|
||||||
* @param lang language in which the translation was found. If no translation
|
|
||||||
* was found, Locale::defaultLanguage() is reported. If null,
|
|
||||||
* the language is not reported.
|
|
||||||
* @param trans raw translation, or original if not found. If no translation
|
|
||||||
* was found, original message is reported. If null, the
|
|
||||||
* translation is not reported.
|
|
||||||
*
|
|
||||||
* @see KLocalizedString
|
|
||||||
*/
|
|
||||||
Q_INVOKABLE void translateRawFrom(const char* catname, const char* msg, QString *lang, QString *trans) const;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Raw translation from a message catalog, with given context.
|
|
||||||
* Context + message are used as the lookup key in the catalog.
|
|
||||||
* If catalog name is null or empty,
|
|
||||||
* all loaded catalogs are searched for the translation.
|
|
||||||
*
|
|
||||||
* Never use this directly to get message translations. See i18n* and ki18n*
|
|
||||||
* calls related to KLocalizedString.
|
|
||||||
*
|
|
||||||
* @param catname the catalog name. Must be UTF-8 encoded.
|
|
||||||
* @param ctxt the context. Must not be null. Must be UTF-8 encoded.
|
|
||||||
* @param msg the message. Must not be null or empty. Must be UTF-8 encoded.
|
|
||||||
* @param lang language in which the translation was found. If no translation
|
|
||||||
* was found, Locale::defaultLanguage() is reported. If null,
|
|
||||||
* the language is not reported.
|
|
||||||
* @param trans raw translation, or original if not found. If no translation
|
|
||||||
* was found, original message is reported. If null, the
|
|
||||||
* translation is not reported.
|
|
||||||
*
|
|
||||||
* @see KLocalizedString
|
|
||||||
*/
|
|
||||||
Q_INVOKABLE void translateRawFrom(const char *catname, const char *ctxt, const char *msg, QString *lang, QString *trans) const;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Raw translation from a message catalog, with given singular/plural form.
|
|
||||||
* Singular form is used as the lookup key in the catalog.
|
|
||||||
* If catalog name is null or empty,
|
|
||||||
* all loaded catalogs are searched for the translation.
|
|
||||||
*
|
|
||||||
* Never use this directly to get message translations. See i18n* and ki18n*
|
|
||||||
* calls related to KLocalizedString.
|
|
||||||
*
|
|
||||||
* @param catname the catalog name. Must be UTF-8 encoded.
|
|
||||||
* @param singular the singular form. Must not be null or empty. Must be UTF-8 encoded.
|
|
||||||
* @param plural the plural form. Must not be null. Must be UTF-8 encoded.
|
|
||||||
* @param n number on which the forms are decided.
|
|
||||||
* @param lang language in which the translation was found. If no translation
|
|
||||||
* was found, Locale::defaultLanguage() is reported. If null,
|
|
||||||
* the language is not reported.
|
|
||||||
* @param trans raw translation, or original if not found. If no translation
|
|
||||||
* was found, original message is reported (either plural or
|
|
||||||
* singular, as determined by @p n ). If null, the
|
|
||||||
* translation is not reported.
|
|
||||||
*
|
|
||||||
* @see KLocalizedString
|
|
||||||
*/
|
|
||||||
Q_INVOKABLE void translateRawFrom(const char *catname, const char *singular, const char *plural, unsigned long n,
|
|
||||||
QString *lang, QString *trans) const;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Raw translation from a message catalog, with given context and
|
|
||||||
* singular/plural form.
|
|
||||||
* Context + singular form is used as the lookup key in the catalog.
|
|
||||||
* If catalog name is null or empty,
|
|
||||||
* all loaded catalogs are searched for the translation.
|
|
||||||
*
|
|
||||||
* Never use this directly to get message translations. See i18n* and ki18n*
|
|
||||||
* calls related to KLocalizedString.
|
|
||||||
*
|
|
||||||
* @param catname the catalog name. Must be UTF-8 encoded.
|
|
||||||
* @param ctxt the context. Must not be null. Must be UTF-8 encoded.
|
|
||||||
* @param singular the singular form. Must not be null or empty. Must be UTF-8 encoded.
|
|
||||||
* @param plural the plural form. Must not be null. Must be UTF-8 encoded.
|
|
||||||
* @param n number on which the forms are decided.
|
|
||||||
* @param lang language in which the translation was found. If no translation
|
|
||||||
* was found, Locale::defaultLanguage() is reported. If null,
|
|
||||||
* the language is not reported.
|
|
||||||
* @param trans raw translation, or original if not found. If no translation
|
|
||||||
* was found, original message is reported (either plural or
|
|
||||||
* singular, as determined by @p n ). If null, the
|
|
||||||
* translation is not reported.
|
|
||||||
*
|
|
||||||
* @see KLocalizedString
|
|
||||||
*/
|
|
||||||
Q_INVOKABLE void translateRawFrom(const char *catname, const char *ctxt, const char *singular, const char *plural,
|
|
||||||
unsigned long n, QString *lang, QString *trans) const;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Various positions for where to place the positive or negative
|
* Various positions for where to place the positive or negative
|
||||||
* sign when they are related to a monetary value.
|
* sign when they are related to a monetary value.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user