Simplify QLocaleXmlWriter::enumData()

Move the repeated List suffix to the __enumTable() helper, where half
the parameter's uses were having to snip it off anyway.

Change-Id: Ia396e87e59ceeb81fc4b0890a86934dc67da10cb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 7 insertions, 7 deletions

diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py
index d8a99f3f3d..97b369fde8 100644
--- a/util/locale_database/qlocalexml.py
+++ b/util/locale_database/qlocalexml.py
@@ -335,9 +335,9 @@ class QLocaleXmlWriter (object):
 
     # Output of various sections, in their usual order:
     def enumData(self, languages, scripts, countries):
-        self.__enumTable('languageList', languages)
-        self.__enumTable('scriptList', scripts)
-        self.__enumTable('countryList', countries)
+        self.__enumTable('language', languages)
+        self.__enumTable('script', scripts)
+        self.__enumTable('country', countries)
 
     def likelySubTags(self, entries):
         self.__openTag('likelySubtags')
@@ -381,14 +381,14 @@ class QLocaleXmlWriter (object):
         raise Error('Attempted to write data after closing :-(')
 
     def __enumTable(self, tag, table):
-        self.__openTag(tag)
+        self.__openTag(tag + 'List')
         for key, value in table.iteritems():
-            self.__openTag(tag[:-4])
+            self.__openTag(tag)
             self.inTag('name', value[0])
             self.inTag('id', key)
             self.inTag('code', value[1])
-            self.__closeTag(tag[:-4])
-        self.__closeTag(tag)
+            self.__closeTag(tag)
+        self.__closeTag(tag + 'List')
 
     def __likelySubTag(self, tag, likely):
         self.__openTag(tag)