diff options
author | mfekari <mfekari@rim.com> | 2012-11-21 11:12:12 -0500 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 20:13:47 +0100 |
commit | 18260ed21240fe4c2d1892def80353448096e54c (patch) | |
tree | 02c8e00f5217b39b0cdf7c8c82b74c6cbc0d1f60 | |
parent | 3249439b203123ca277b931a34814f383715b0e8 (diff) |
BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
Change-Id: I87708aad18ebe1c6a08fe89376290be66f9c0577
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
-rw-r--r-- | src/corelib/tools/qlocale_p.h | 12 | ||||
-rw-r--r-- | src/corelib/tools/qlocale_unix.cpp | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 4d5d918878..65201374a9 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -59,7 +59,7 @@ #include "qlocale.h" -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) #include "qsocketnotifier.h" #endif @@ -373,17 +373,17 @@ inline char QLocalePrivate::digitToCLocale(QChar in) const return 0; } -#if defined(Q_OS_QNX) -class QBBLocaleData: public QObject +#if defined(Q_OS_BLACKBERRY) +class QQNXLocaleData: public QObject { Q_OBJECT public: - QBBLocaleData(); - virtual ~QBBLocaleData(); + QQNXLocaleData(); + virtual ~QQNXLocaleData(); void readPPSLocale(); public Q_SLOTS: - void updateMesurementSystem(); + void updateMeasurementSystem(); public: uint ppsMeasurement; diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp index f43065239e..b2aaec7c3d 100644 --- a/src/corelib/tools/qlocale_unix.cpp +++ b/src/corelib/tools/qlocale_unix.cpp @@ -47,7 +47,7 @@ #include "qvariant.h" #include "qreadwritelock.h" -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) #include <QtCore/private/qcore_unix_p.h> #include <unistd.h> @@ -57,24 +57,24 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) static const char ppsServicePath[] = "/pps/services/locale/uom"; static const size_t ppsBufferSize = 256; -QBBLocaleData::QBBLocaleData() +QQNXLocaleData::QQNXLocaleData() :ppsNotifier(0) ,ppsFd(-1) { readPPSLocale(); } -QBBLocaleData::~QBBLocaleData() +QQNXLocaleData::~QQNXLocaleData() { if (ppsFd != -1) qt_safe_close(ppsFd); } -void QBBLocaleData::updateMesurementSystem() +void QQNXLocaleData::updateMeasurementSystem() { char buffer[ppsBufferSize]; @@ -105,7 +105,7 @@ void QBBLocaleData::updateMesurementSystem() ppsMeasurement = QLocale::MetricSystem; } -void QBBLocaleData::readPPSLocale() +void QQNXLocaleData::readPPSLocale() { errno = 0; ppsFd = qt_safe_open(ppsServicePath, O_RDONLY); @@ -115,8 +115,8 @@ void QBBLocaleData::readPPSLocale() } ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this); - updateMesurementSystem(); - QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMesurementSystem())); + updateMeasurementSystem(); + QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMeasurementSystem())); } #endif @@ -176,8 +176,8 @@ void QSystemLocaleData::readEnvironment() Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData) -#if defined(Q_OS_QNX) - Q_GLOBAL_STATIC(QBBLocaleData, qbbLocaleData) +#if defined(Q_OS_BLACKBERRY) + Q_GLOBAL_STATIC(QQNXLocaleData, qqnxLocaleData) #endif #endif @@ -210,8 +210,8 @@ QLocale QSystemLocale::fallbackUiLocale() const QVariant QSystemLocale::query(QueryType type, QVariant in) const { QSystemLocaleData *d = qSystemLocaleData(); -#if defined(Q_OS_QNX) - QBBLocaleData *bbd = qbbLocaleData(); +#if defined(Q_OS_BLACKBERRY) + QQNXLocaleData *qnxd = qqnxLocaleData(); #endif if (type == LocaleChanged) { @@ -300,8 +300,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const return QLocale::MetricSystem; if (meas_locale.compare(QLatin1String("Other"), Qt::CaseInsensitive) == 0) return QLocale::MetricSystem; -#if defined(Q_OS_QNX) - return bbd->ppsMeasurement; +#if defined(Q_OS_BLACKBERRY) + return qnxd->ppsMeasurement; #endif return QVariant((int)QLocale(meas_locale).measurementSystem()); } |