winrt: Clean up QWinRTServices

- Remove WinRT types from the header
- Use ComPtr everywhere
- Use convenience methods for HRESULT and async operations

Task-number: QTBUG-38115
Change-Id: I540a3349612b98c45545c92b2cb6d21a34918b8f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

1 files changed, 6 insertions, 21 deletions

diff --git a/src/plugins/platforms/winrt/qwinrtservices.h b/src/plugins/platforms/winrt/qwinrtservices.h
index 9cc917030a..d3abe6f2bd 100644
--- a/src/plugins/platforms/winrt/qwinrtservices.h
+++ b/src/plugins/platforms/winrt/qwinrtservices.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -43,23 +43,11 @@
 #define QWINRTSERVICES_H
 
 #include <qpa/qplatformservices.h>
+#include <QtCore/QScopedPointer>
 
-namespace ABI {
-    namespace Windows {
-        namespace Foundation {
-            struct IUriRuntimeClassFactory;
-        }
-        namespace Storage {
-            struct IStorageFileStatics;
-        }
-        namespace System {
-            struct ILauncherStatics;
-        }
-    }
-}
-
-QT_BEGIN_NAMESPACE
+QT_USE_NAMESPACE
 
+class QWinRTServicesPrivate;
 class QWinRTServices : public QPlatformServices
 {
 public:
@@ -70,11 +58,8 @@ public:
     bool openDocument(const QUrl &url);
 
 private:
-    ABI::Windows::Foundation::IUriRuntimeClassFactory *m_uriFactory;
-    ABI::Windows::Storage::IStorageFileStatics *m_fileFactory;
-    ABI::Windows::System::ILauncherStatics *m_launcher;
+    QScopedPointer<QWinRTServicesPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(QWinRTServices)
 };
 
-QT_END_NAMESPACE
-
 #endif // QWINRTSERVICES_H