From c28fde3fdac19fd5a5f614bb7983080031c924b3 Mon Sep 17 00:00:00 2001
From: Gerry Boland <gerry.boland@canonical.com>
Date: Wed, 2 Nov 2016 16:46:53 +0000
Subject: Mirclient: update based on upstream development in lp:qtubuntu

This is based on revision 360 of lp:qtubuntu.

Main features/bugs fixed:
- fix QQuickWidget-based app rendering
- wire up Qt window types to Mir to enable desktop-based applications
  to function with a window manager
- use QEGLPlatformContext and QEGLPBuffer instead of custom code
- correctly populate and update list of QScreens
- support for switching keyboard layouts
- improve window resizing to fix visual glitching

Change-Id: If816a858eb10b6356275d4b80c89a72562b3c29f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
---
 .../platforms/mirclient/qmirclientclipboard.h      | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/plugins/platforms/mirclient/qmirclientclipboard.h')

diff --git a/src/plugins/platforms/mirclient/qmirclientclipboard.h b/src/plugins/platforms/mirclient/qmirclientclipboard.h
index 1394498320..09e9bcdf38 100644
--- a/src/plugins/platforms/mirclient/qmirclientclipboard.h
+++ b/src/plugins/platforms/mirclient/qmirclientclipboard.h
@@ -45,7 +45,15 @@
 
 #include <QMimeData>
 #include <QPointer>
-class QDBusInterface;
+
+namespace com {
+    namespace ubuntu {
+        namespace content {
+            class Hub;
+        }
+    }
+}
+
 class QDBusPendingCallWatcher;
 
 class QMirClientClipboard : public QObject, public QPlatformClipboard
@@ -61,31 +69,24 @@ public:
     bool supportsMode(QClipboard::Mode mode) const override;
     bool ownsMode(QClipboard::Mode mode) const override;
 
-    void requestDBusClipboardContents();
-
 private Q_SLOTS:
-    void onDBusClipboardGetContentsFinished(QDBusPendingCallWatcher*);
-    void onDBusClipboardSetContentsFinished(QDBusPendingCallWatcher*);
-    void updateMimeData(const QByteArray &serializedMimeData);
+    void onApplicationStateChanged(Qt::ApplicationState state);
 
 private:
-    void setupDBus();
-
-    QByteArray serializeMimeData(QMimeData *mimeData) const;
-    QMimeData *deserializeMimeData(const QByteArray &serializedMimeData) const;
-
-    void setDBusClipboardContents(const QByteArray &clipboardContents);
+    void updateMimeData();
+    void requestMimeData();
 
     QMimeData *mMimeData;
-    bool mIsOutdated;
 
-    QPointer<QDBusInterface> mDBusClipboard;
+    enum {
+        OutdatedClipboard, // Our mimeData is outdated, need to fetch latest from ContentHub
+        SyncingClipboard, // Our mimeData is outdated and we are waiting for ContentHub to reply with the latest paste
+        SyncedClipboard // Our mimeData is in sync with what ContentHub has
+    } mClipboardState{OutdatedClipboard};
 
-    QPointer<QDBusPendingCallWatcher> mPendingGetContentsCall;
-    QPointer<QDBusPendingCallWatcher> mPendingSetContentsCall;
+    com::ubuntu::content::Hub *mContentHub;
 
-    bool mUpdatesDisabled;
-    bool mDBusSetupDone;
+    QDBusPendingCallWatcher *mPasteReply{nullptr};
 };
 
 #endif // QMIRCLIENTCLIPBOARD_H
-- 
cgit v1.2.3