Fix a bug in QSystemLocale on BB10

Call qt_safe_open in the constructor
to avoid opening the pps files several times.

backport: f1d8987b82ce6b0a852b715a8713608bfd72aabf

Change-Id: Ia6b8ca339fa2f9f85df28792e95242b6ff7b70ca
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

2 files changed, 20 insertions, 18 deletions

diff --git a/src/corelib/tools/qlocale_blackberry.cpp b/src/corelib/tools/qlocale_blackberry.cpp
index 09b81ca..13d2863 100644
--- a/src/corelib/tools/qlocale_blackberry.cpp
+++ b/src/corelib/tools/qlocale_blackberry.cpp
@@ -67,11 +67,19 @@ QBBSystemLocaleData::QBBSystemLocaleData()
     , regionNotifier(0)
     , measurementNotifier(0)
     , hourNotifier(0)
-    , languageFd(-1)
-    , regionFd(-1)
-    , measurementFd(-1)
-    , hourFd(-1)
 {
+    if ((measurementFd = qt_safe_open(ppsUomPath, O_RDONLY)) == -1)
+        qWarning("Failed to open uom pps, errno=%d", errno);
+
+    if ((regionFd = qt_safe_open(ppsRegionLocalePath, O_RDONLY)) == -1)
+        qWarning("Failed to open region pps, errno=%d", errno);
+
+    if ((languageFd = qt_safe_open(ppsLanguageLocalePath, O_RDONLY)) == -1)
+        qWarning("Failed to open language pps, errno=%d", errno);
+
+    if ((hourFd = qt_safe_open(ppsHourFormatPath, O_RDONLY)) == -1)
+        qWarning("Failed to open hour format pps, errno=%d", errno);
+
     // we cannot call this directly, because by the time this constructor is
     // called, the event dispatcher has not yet been created, causing the
     // subsequent call to QSocketNotifier constructor to fail.
@@ -149,41 +157,35 @@ void QBBSystemLocaleData::installSocketNotifiers()
 
 void QBBSystemLocaleData::readLangageLocale()
 {
-    lc_langage = readPpsValue(ppsLanguageLocalePath, "_CS_LOCALE", &languageFd);
+    lc_langage = readPpsValue("_CS_LOCALE", languageFd);
 }
 
 void QBBSystemLocaleData::readRegionLocale()
 {
-    lc_region = readPpsValue(ppsRegionLocalePath, "region", &regionFd);
+    lc_region = readPpsValue("region", regionFd);
 }
 
 void QBBSystemLocaleData::readMeasurementSystem()
 {
-    QByteArray measurement = readPpsValue(ppsUomPath, "uom", &measurementFd);
+    QByteArray measurement = readPpsValue("uom", measurementFd);
     m_measurementSystem = (qstrcmp(measurement, "imperial") == 0) ? QLocale::ImperialSystem : QLocale::MetricSystem;
 }
 
 void QBBSystemLocaleData::readHourFormat()
 {
-    QByteArray hourFormat = readPpsValue(ppsHourFormatPath, "hourFormat", &hourFd);
+    QByteArray hourFormat = readPpsValue("hourFormat", hourFd);
     is24HourFormat = (qstrcmp(hourFormat, "24") == 0);
 }
 
-QByteArray QBBSystemLocaleData::readPpsValue(const char *ppsPath, const char *ppsObject, int *ppsFd)
+QByteArray QBBSystemLocaleData::readPpsValue(const char *ppsObject, int ppsFd)
 {
     QByteArray result;
-    if (!ppsPath || !ppsObject)
+    if (!ppsObject || ppsFd == -1)
         return result;
 
-    *ppsFd = qt_safe_open(ppsPath, O_RDONLY);
-    if (*ppsFd == -1) {
-        qWarning("Failed to open Locale pps, errno=%d", errno);
-        return result;
-    }
-
     char buffer[ppsBufferSize];
 
-    int bytes = qt_safe_read(*ppsFd, buffer, ppsBufferSize - 1);
+    int bytes = qt_safe_read(ppsFd, buffer, ppsBufferSize - 1);
     if (bytes == -1) {
         qWarning("Failed to read Locale pps, errno=%d", errno);
         return result;
diff --git a/src/corelib/tools/qlocale_blackberry.h b/src/corelib/tools/qlocale_blackberry.h
index 3a5bc20..7167d33 100644
--- a/src/corelib/tools/qlocale_blackberry.h
+++ b/src/corelib/tools/qlocale_blackberry.h
@@ -77,7 +77,7 @@ public Q_SLOTS:
     void readHourFormat();
 
 private:
-    QByteArray readPpsValue(const char* ppsPath, const char* ppsObject, int* ppsFd);
+    QByteArray readPpsValue(const char *ppsObject, int ppsFd);
     QString getCorrectFormat(const QString &baseFormat, QLocale::FormatType typeFormat);
 
     QByteArray lc_langage;