From bb5b25e40d7d886961b423f0c3757684e1f47032 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Fri, 4 Jul 2014 15:16:06 +0300
Subject: winrt: Clean up platform theme

- Drop "Platform" from class name for consistency
- Move styleHint() into theme class for better code reuse
- Use ComPtr and result checking
- Remove obsolete WinRT ifdefs

Change-Id: Id26bd75739a9665f61ee2e70eb3fb36747b75410
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
---
 src/plugins/platforms/winrt/qwinrtintegration.cpp | 37 ++---------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

(limited to 'src/plugins/platforms/winrt/qwinrtintegration.cpp')

diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp
index 806b8f99bb..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()
@@ -114,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
@@ -181,7 +150,7 @@ QPlatformTheme *QWinRTIntegration::createPlatformTheme(const QString &
 name) const
 {
     if (name == QLatin1String("winrt"))
-        return new QWinRTPlatformTheme();
+        return new QWinRTTheme();
 
     return 0;
 }
-- 
cgit v1.2.3