From 6d36a83b419e0b0bc0270e45983ed2bbfa453996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 4 Nov 2012 18:56:45 +0100 Subject: iOS: Get rid of singleton instance accessor in platform plugin None of the other platform plugins have one, and it's not used anywhere. Change-Id: Id46ab5f75c9819511c3e9d123d0338c3c8799869 Reviewed-by: Richard Moe Gustavsen --- src/plugins/platforms/ios/qiosintegration.h | 2 -- src/plugins/platforms/ios/qiosintegration.mm | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h index f44403fbba..ef839a89b0 100644 --- a/src/plugins/platforms/ios/qiosintegration.h +++ b/src/plugins/platforms/ios/qiosintegration.h @@ -52,8 +52,6 @@ public: QIOSIntegration(); ~QIOSIntegration(); - static QIOSIntegration *instance(); - QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 98b08ed72a..1b03b410cb 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -51,18 +51,9 @@ QT_BEGIN_NAMESPACE -static QIOSIntegration *m_instance = 0; - -QIOSIntegration * QIOSIntegration::instance() -{ - return m_instance; -} - QIOSIntegration::QIOSIntegration() :m_fontDb(new QCoreTextFontDatabase) { - if (!m_instance) - m_instance = this; m_screens << new QIOSScreen(0); } -- cgit v1.2.3