summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-11-04 19:43:57 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:55:34 +0100
commit422eed16eb22772357aab06feb12c59f5d188b2c (patch)
tree8a325c11ef946609d738fe108d12a6a8cafd8a92
parent5e85aa9ab4c30c123de6431679d3870a4b7836c2 (diff)
iOS: Style nitpicking, rename m_fontDb to m_fontDatabase
Change-Id: I9d92843af9018d51b73fadcc7c20d792fad772fa Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/plugins/platforms/ios/qiosintegration.h2
-rw-r--r--src/plugins/platforms/ios/qiosintegration.mm5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index 8b2ac70a9f..d744cf377a 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -61,7 +61,7 @@ public:
QAbstractEventDispatcher *guiThreadEventDispatcher() const;
private:
- QPlatformFontDatabase *m_fontDb;
+ QPlatformFontDatabase *m_fontDatabase;
QPlatformScreen *m_screen;
};
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 7a6dec43d4..d3e9572f83 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -52,7 +52,8 @@
QT_BEGIN_NAMESPACE
QIOSIntegration::QIOSIntegration()
- :m_fontDb(new QCoreTextFontDatabase), m_screen(new QIOSScreen(QIOSScreen::MainScreen))
+ : m_fontDatabase(new QCoreTextFontDatabase)
+ , m_screen(new QIOSScreen(QIOSScreen::MainScreen))
{
screenAdded(m_screen);
}
@@ -86,7 +87,7 @@ QAbstractEventDispatcher *QIOSIntegration::guiThreadEventDispatcher() const
QPlatformFontDatabase * QIOSIntegration::fontDatabase() const
{
- return m_fontDb;
+ return m_fontDatabase;
}
QT_END_NAMESPACE