1 files changed, 4 insertions, 54 deletions

diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp
index b3a2cafa2e..53d52a430c 100644
--- a/src/plugins/platforms/winrt/qwinrtintegration.cpp
+++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp
@@ -48,7 +48,7 @@
 #include "qwinrtservices.h"
 #include "qwinrteglcontext.h"
 #include "qwinrtfontdatabase.h"
-#include "qwinrtplatformtheme.h"
+#include "qwinrttheme.h"
 
 #include <QtGui/QOpenGLContext>
 
@@ -63,18 +63,6 @@ using namespace ABI::Windows::UI::Core;
 using namespace ABI::Windows::UI::ViewManagement;
 using namespace ABI::Windows::ApplicationModel::Core;
 
-static IUISettings *getSettings()
-{
-    static IUISettings *settings = 0;
-    if (!settings) {
-        if (FAILED(RoActivateInstance(Wrappers::HString::MakeReference(RuntimeClass_Windows_UI_ViewManagement_UISettings).Get(),
-                                      reinterpret_cast<IInspectable **>(&settings)))) {
-            qWarning("Could not activate UISettings.");
-        }
-    }
-    return settings;
-}
-
 QT_BEGIN_NAMESPACE
 
 QWinRTIntegration::QWinRTIntegration()
@@ -82,26 +70,7 @@ QWinRTIntegration::QWinRTIntegration()
     , m_fontDatabase(new QWinRTFontDatabase)
     , m_services(new QWinRTServices)
 {
-    // Obtain the WinRT Application, view, and window
-    ICoreApplication *application;
-    if (FAILED(RoGetActivationFactory(Wrappers::HString::MakeReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(),
-                                      IID_PPV_ARGS(&application))))
-        qCritical("Could not attach to the application factory.");
-
-    ICoreApplicationView *view;
-    if (FAILED(application->GetCurrentView(&view))) {
-        qCritical("Could not obtain the application view - have you started outside of WinRT?");
-        return;
-    }
-
-    // Get core window (will act as our screen)
-    ICoreWindow *window;
-    if (FAILED(view->get_CoreWindow(&window))) {
-        qCritical("Could not obtain the application window - have you started outside of WinRT?");
-        return;
-    }
-    window->Activate();
-    m_screen = new QWinRTScreen(window);
+    m_screen = new QWinRTScreen;
     screenAdded(m_screen);
 
     m_success = true;
@@ -133,26 +102,7 @@ bool QWinRTIntegration::hasCapability(QPlatformIntegration::Capability cap) cons
 
 QVariant QWinRTIntegration::styleHint(StyleHint hint) const
 {
-    switch (hint) {
-    case CursorFlashTime:
-        if (IUISettings *settings = getSettings()) {
-            quint32 blinkRate;
-            settings->get_CaretBlinkRate(&blinkRate);
-            return blinkRate;
-        }
-        break;
-    case MouseDoubleClickInterval:
-        if (IUISettings *settings = getSettings()) {
-            quint32 doubleClickTime;
-            settings->get_DoubleClickTime(&doubleClickTime);
-            return doubleClickTime;
-        }
-    case ShowIsFullScreen:
-        return true;
-    default:
-        break;
-    }
-    return QPlatformIntegration::styleHint(hint);
+    return QWinRTTheme::styleHint(hint);
 }
 
 QPlatformWindow *QWinRTIntegration::createPlatformWindow(QWindow *window) const
@@ -200,7 +150,7 @@ QPlatformTheme *QWinRTIntegration::createPlatformTheme(const QString &
 name) const
 {
     if (name == QLatin1String("winrt"))
-        return new QWinRTPlatformTheme();
+        return new QWinRTTheme();
 
     return 0;
 }