Changes: remove obsolete name and address formatting code

RevBy: John Tapsell

Details:

The name and address formatting is gone for a while already
but there was some unused stuff left over which was apparently
overlooked when removing the name and address formatting code.

1 files changed, 0 insertions, 34 deletions

diff --git a/src/corelib/i18n/mlocale.cpp b/src/corelib/i18n/mlocale.cpp
index 54617a98..c63ad0ae 100644
--- a/src/corelib/i18n/mlocale.cpp
+++ b/src/corelib/i18n/mlocale.cpp
@@ -52,7 +52,6 @@
 namespace
 {
     const char *const BackupNameFormatString = "%d%t%g%t%m%t%f";
-    const char *const ExtraDataBundleName = "extradata";
     const QString RtlLanguages("am:ar:fa:he:ps:ur:");
     const char *const Languages = "Languages";
     const char *const Countries = "Countries";
@@ -1760,39 +1759,6 @@ QString MLocale::weekdayName(const MCalendar &mCalendar, int weekday,
 #endif
 
 #ifdef HAVE_ICU
-namespace
-{
-// fetches a resource bundle for name formats
-    UResourceBundle *nameFmtsResourceBundle()
-    {
-        UErrorCode status = U_ZERO_ERROR;
-
-        UResourceBundle *extraData = ures_openDirect(ExtraDataBundleName, "", &status);
-
-        if (U_FAILURE(status)) {
-            mDebug("mlocale.cpp") << "Error ures_open" << u_errorName(status);
-        }
-
-        UResourceBundle *posixData = ures_getByKey(extraData, "posixdata", NULL, &status);
-
-        if (U_FAILURE(status)) {
-            mDebug("mlocale.cpp") << "Error ures_open posixData" << u_errorName(status);
-        }
-
-        UResourceBundle *nameFmts = ures_getByKey(posixData, "nameFmts", NULL, &status);
-        if (U_FAILURE(status)) {
-            mDebug("mlocale.cpp") << "Error ures_open nameFmts" << u_errorName(status);
-        }
-
-        ures_close(extraData);
-        ures_close(posixData);
-
-        return nameFmts;
-    }
-}
-#endif
-
-#ifdef HAVE_ICU
 QString MLocale::languageEndonym() const
 {
     Q_D(const MLocale);