From 028df24350f180ce323b002a15d570ca23b4438e Mon Sep 17 00:00:00 2001
From: Giorgos Tsiapaliwkas <terietor@gmail.com>
Date: Tue, 13 Mar 2012 12:56:27 +0200
Subject: [PATCH] Remove the methods insert/removeCatalog from the Locale class

---
 declarativeimports/locale/locale.cpp | 10 ----------
 declarativeimports/locale/locale.h   | 23 ++---------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/declarativeimports/locale/locale.cpp b/declarativeimports/locale/locale.cpp
index daf8990d2..4adb06f57 100644
--- a/declarativeimports/locale/locale.cpp
+++ b/declarativeimports/locale/locale.cpp
@@ -72,16 +72,6 @@ QString Locale::currencyCode() const
     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)
 {
     m_locale->setActiveCatalog(catalog);
diff --git a/declarativeimports/locale/locale.h b/declarativeimports/locale/locale.h
index ceb98da13..78d7f2b30 100644
--- a/declarativeimports/locale/locale.h
+++ b/declarativeimports/locale/locale.h
@@ -1467,25 +1467,6 @@ public:
      */
     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.
      * @param catalog The catalog to activate.
@@ -1582,7 +1563,7 @@ public:
      * @param charset set to the charset part of the locale
      */
     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
@@ -1672,7 +1653,7 @@ public:
      *
      * @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;
 
     /**
      *