summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorEl Mehdi Fekari <mfekari@rim.com>2013-03-28 17:57:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-30 10:50:40 +0100
commit2523f20c61cf4173fad90094d9d2ab8c6a2a461b (patch)
tree9073dff8323769fb27e55e01e8f3efe06e2242d1 /src/corelib/tools
parent21c23ca539c6b61c1311bfe81eb88b9477d742cc (diff)
Fix typos in QBBSystemLocaleData
Change-Id: Ic893cdf4a274af660fae7f39011851318f0d244b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qlocale_blackberry.cpp12
-rw-r--r--src/corelib/tools/qlocale_blackberry.h6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/tools/qlocale_blackberry.cpp b/src/corelib/tools/qlocale_blackberry.cpp
index 030ed2184b..1db7b7d546 100644
--- a/src/corelib/tools/qlocale_blackberry.cpp
+++ b/src/corelib/tools/qlocale_blackberry.cpp
@@ -85,7 +85,7 @@ QBBSystemLocaleData::QBBSystemLocaleData()
// subsequent call to QSocketNotifier constructor to fail.
QMetaObject::invokeMethod(this, "installSocketNotifiers", Qt::QueuedConnection);
- readLangageLocale();
+ readLanguageLocale();
readRegionLocale();
readMeasurementSystem();
readHourFormat();
@@ -123,8 +123,8 @@ QVariant QBBSystemLocaleData::dateTimeFormat(QLocale::FormatType formatType)
QLocale QBBSystemLocaleData::languageLocale()
{
- if (!lc_langage.isEmpty())
- return QLocale(QLatin1String(lc_langage));
+ if (!lc_language.isEmpty())
+ return QLocale(QLatin1String(lc_language));
return QLocale::c();
}
@@ -143,7 +143,7 @@ void QBBSystemLocaleData::installSocketNotifiers()
Q_ASSERT(QCoreApplication::instance());
languageNotifier = new QSocketNotifier(languageFd, QSocketNotifier::Read, this);
- QObject::connect(languageNotifier, SIGNAL(activated(int)), this, SLOT(readLangageLocale()));
+ QObject::connect(languageNotifier, SIGNAL(activated(int)), this, SLOT(readLanguageLocale()));
regionNotifier = new QSocketNotifier(regionFd, QSocketNotifier::Read, this);
QObject::connect(regionNotifier, SIGNAL(activated(int)), this, SLOT(readRegionLocale()));
@@ -155,9 +155,9 @@ void QBBSystemLocaleData::installSocketNotifiers()
QObject::connect(hourNotifier, SIGNAL(activated(int)), this, SLOT(readHourFormat()));
}
-void QBBSystemLocaleData::readLangageLocale()
+void QBBSystemLocaleData::readLanguageLocale()
{
- lc_langage = readPpsValue("_CS_LOCALE", languageFd);
+ lc_language = readPpsValue("_CS_LOCALE", languageFd);
}
void QBBSystemLocaleData::readRegionLocale()
diff --git a/src/corelib/tools/qlocale_blackberry.h b/src/corelib/tools/qlocale_blackberry.h
index 67f403a017..cc186f6c0f 100644
--- a/src/corelib/tools/qlocale_blackberry.h
+++ b/src/corelib/tools/qlocale_blackberry.h
@@ -67,16 +67,16 @@ public:
public Q_SLOTS:
void installSocketNotifiers();
- void readLangageLocale();
+ void readLanguageLocale();
void readRegionLocale();
void readMeasurementSystem();
void readHourFormat();
private:
- QByteArray readPpsValue(const char* ppsObject, int ppsFd);
+ QByteArray readPpsValue(const char *ppsObject, int ppsFd);
QString getCorrectFormat(const QString &baseFormat, QLocale::FormatType typeFormat);
- QByteArray lc_langage;
+ QByteArray lc_language;
QByteArray lc_region;
uint m_measurementSystem;
bool is24HourFormat;