Remove unusable code for qml

declarativeimports/locale/locale.cpp

@@ -29,31 +29,12 @@ Locale::Locale(QObject* parent)
     m_locale = new KLocale(*KGlobal::locale());
 }
 
-
-bool Locale::setCountry(const QString &country, KConfig *config)
-{
-    emit countryChanged();
-    return m_locale->setCountry(country, config);
-}
-
 bool Locale::setCountryDivisionCode(const QString &countryDivisionCode)
 {
     emit countryDivisionCodeChanged();
     return m_locale->setCountryDivisionCode(countryDivisionCode);
 }
 
-bool Locale::setLanguage(const QString &language, KConfig *config)
-{
-    emit languageChanged();
-    return m_locale->setLanguage(language, config);
-}
-
-bool Locale::setLanguage(const QStringList &languages)
-{
-    emit languageChanged();
-    return m_locale->setLanguage(languages);
-}
-
 void Locale::setCurrencyCode(const QString &newCurrencyCode)
 {
     emit currencyCodeChanged();
@@ -86,11 +67,6 @@ QString Locale::countryDivisionCode() const
     return m_locale->countryDivisionCode();
 }
 
-KCurrencyCode *Locale::currency() const
-{
-    return m_locale->currency();
-}
-
 QString Locale::currencyCode() const
 {
     return m_locale->currencyCode();
@@ -594,11 +570,6 @@ int Locale::fileEncodingMib() const
     return m_locale->fileEncodingMib();
 }
 
-QTextCodec *Locale::codecForEncoding() const
-{
-    return m_locale->codecForEncoding();
-}
-
 bool Locale::setEncoding(int mibEnum)
 {
     return m_locale->setEncoding(mibEnum);

declarativeimports/locale/locale.h

@@ -411,14 +411,6 @@ public:
     */
     QString currencyCode() const;
 
-    /**
-     *
-     * Returns the Currency Code object for the current locale
-     *
-     * @return The default Currency Code object used by locale.
-    */
-    Q_INVOKABLE KCurrencyCode *currency() const;
-
     /**
      * Returns what the symbol denoting currency in the current locale
      * as as defined by user settings should look like.
@@ -1353,17 +1345,6 @@ public:
      */
     Q_INVOKABLE int encodingMib() const;
 
-    /**
-     * Returns the user's preferred encoding. Should never be NULL.
-     *
-     * @return The codec for the preferred encoding
-     *
-     * @see encoding
-     * @see encodingMib
-     */
-    //TODO will this work?
-    Q_INVOKABLE QTextCodec *codecForEncoding() const;
-
     /**
      * Returns the file encoding.
      *
@@ -1851,26 +1832,6 @@ public:
      */
     Q_INVOKABLE void copyCatalogsTo(Locale *locale);
 
-    /**
-     * Changes the current country. The current country will be left
-     * unchanged if failed. It will force a reload of the country specific
-     * configuration.
-     *
-     * An empty country value will set the country to the system default.
-     *
-     * If you specify a configuration file, a setLocale() will be performed on
-     * the config using the current locale language, which may cause a sync()
-     * and reparseConfiguration() which will save any changes you have made.
-     *
-     * @param country the ISO 3166 country code
-     * @param config  a configuration file with a Locale group detailing
-     *                locale-related preferences (such as language and
-     *                formatting options).
-     *
-     * @return @c true on success, @c false on failure
-     */
-    bool setCountry(const QString & country, KConfig *config);
-
     /**
      *
      * Sets the Country Division Code of the Country where the user lives.
@@ -1887,35 +1848,6 @@ public:
      */
     bool setCountryDivisionCode(const QString & countryDivision);
 
-    /**
-     * Changes the current language. The current language will be left
-     * unchanged if failed. It will force a reload of the country specific
-     * configuration as well.
-     *
-     * If you specify a configuration file, a setLocale() will be performed on
-     * the config using the current locale language, which may cause a sync()
-     * and reparseConfiguration() which will save any changes you have made.
-     *
-     * @param language the language code
-     * @param config   a configuration file with a Locale group detailing
-     *                 locale-related preferences (such as language and
-     *                 formatting options).
-     *
-     * @return true on success
-     */
-    bool setLanguage(const QString &language, KConfig *config);
-
-    /**
-     * Changes the list of preferred languages for the locale. The first valid
-     * language in the list will be used, or the default language (en_US)
-     * if none of the specified languages were available.
-     *
-     * @param languages the list of language codes
-     *
-     * @return true if one of the specified languages were used
-     */
-    bool setLanguage(const QStringList &languages);
-
     /**
      *
      * Tries to find a path to the localized file for the given original path.