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

Remove the methods insert/removeCatalog from the Locale class

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-03-13 12:56:27 +02:00
parent b9efdcc1e4
commit 028df24350
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
declarativeimports/locale/locale.cpp
View File

@ -72,16 +72,6 @@ QString Locale::currencyCode() const
return m_locale->currencyCode(); return m_locale->currencyCode();
} }
void Locale::insertCatalog(const QString &catalog)
{
m_locale->insertCatalog(catalog);
}
void Locale::removeCatalog(const QString &catalog)
{
m_locale->removeCatalog(catalog);
}
void Locale::setActiveCatalog(const QString &catalog) void Locale::setActiveCatalog(const QString &catalog)
{ {
m_locale->setActiveCatalog(catalog); m_locale->setActiveCatalog(catalog);

23
declarativeimports/locale/locale.h
View File

@ -1467,25 +1467,6 @@ public:
*/ */
void setMeasureSystem(MeasureSystem value); void setMeasureSystem(MeasureSystem value);
/**
* Adds another catalog to search for translation lookup.
* This function is useful for extern libraries and/or code,
* that provide their own messages.
*
* If the catalog does not exist for the chosen language,
* it will be ignored and en_US will be used.
*
* @param catalog The catalog to add.
*/
Q_INVOKABLE void insertCatalog(const QString& catalog);
/**
* Removes a catalog for translation lookup.
* @param catalog The catalog to remove.
* @see insertCatalog()
*/
Q_INVOKABLE void removeCatalog(const QString &catalog);
/** /**
* Sets the active catalog for translation lookup. * Sets the active catalog for translation lookup.
* @param catalog The catalog to activate. * @param catalog The catalog to activate.
@ -1582,7 +1563,7 @@ public:
* @param charset set to the charset part of the locale * @param charset set to the charset part of the locale
*/ */
Q_INVOKABLE static void splitLocale(const QString &locale, QString &language, QString &country, Q_INVOKABLE static void splitLocale(const QString &locale, QString &language, QString &country,
QString &modifier, QString &charset); //TODO remove? QString &modifier, QString &charset);
/** /**
* Use this as main catalog for *all* KLocales, if not the appname * Use this as main catalog for *all* KLocales, if not the appname
@ -1672,7 +1653,7 @@ public:
* *
* @return path to the localized file if found, original path otherwise * @return path to the localized file if found, original path otherwise
*/ */
Q_INVOKABLE QString localizedFilePath(const QString &filePath) const;//TODO remove Q_INVOKABLE QString localizedFilePath(const QString &filePath) const;
/** /**
* *