From 2653160c5ab7ed20ac35adb2ab1978b4fb4cee31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Thu, 8 May 2014 11:15:58 +0200
Subject: [PATCH] [tabbox/qml] Do not export the item's model data as a variant

The hack to get the model data from the currently selected item to the
areas outside the list view apparently broke in Qt. Now we have to export
the model data elements we actually use.

BUG: 334478
REVIEW: 118047
---
 tabbox/qml/IconTabBox.qml                           |  4 ++--
 tabbox/qml/clients/big_icons/contents/ui/main.qml   |  2 +-
 tabbox/qml/clients/small_icons/contents/ui/main.qml |  2 +-
 tabbox/qml/clients/thumbnails/contents/ui/main.qml  | 10 ++++++----
 tabbox/qml/desktops/previews/contents/ui/main.qml   |  6 +++---
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tabbox/qml/IconTabBox.qml b/tabbox/qml/IconTabBox.qml
index ed761e2cbf..a8e3237091 100644
--- a/tabbox/qml/IconTabBox.qml
+++ b/tabbox/qml/IconTabBox.qml
@@ -44,12 +44,12 @@ Item {
     Component {
         id: listDelegate
         Item {
-            property alias data: iconItem.data
+            property alias caption: iconItem.caption
             id: delegateItem
             width: iconSize + hoverItem.margins.left + hoverItem.margins.right
             height: iconSize + hoverItem.margins.top + hoverItem.margins.bottom
             QIconItem {
-                property variant data: model
+                property variant caption: model.caption
                 id: iconItem
                 icon: model.icon
                 width: iconSize
diff --git a/tabbox/qml/clients/big_icons/contents/ui/main.qml b/tabbox/qml/clients/big_icons/contents/ui/main.qml
index 4892732666..241c9f208b 100644
--- a/tabbox/qml/clients/big_icons/contents/ui/main.qml
+++ b/tabbox/qml/clients/big_icons/contents/ui/main.qml
@@ -79,7 +79,7 @@ KWin.Switcher {
                     }
                     id: textItem
                     property int maxWidth: 0
-                    text: icons.currentItem ? icons.currentItem.data.caption : ""
+                    text: icons.currentItem ? icons.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
                     color: theme.textColor
diff --git a/tabbox/qml/clients/small_icons/contents/ui/main.qml b/tabbox/qml/clients/small_icons/contents/ui/main.qml
index a044e0efaa..03e2b617f0 100644
--- a/tabbox/qml/clients/small_icons/contents/ui/main.qml
+++ b/tabbox/qml/clients/small_icons/contents/ui/main.qml
@@ -67,7 +67,7 @@ KWin.Switcher {
                 }
                 Text {
                     id: textItem
-                    text: icons.currentItem ? icons.currentItem.data.caption : ""
+                    text: icons.currentItem ? icons.currentItem.caption : ""
                     height: paintedHeight
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
diff --git a/tabbox/qml/clients/thumbnails/contents/ui/main.qml b/tabbox/qml/clients/thumbnails/contents/ui/main.qml
index c0ec949d65..7ba658440c 100644
--- a/tabbox/qml/clients/thumbnails/contents/ui/main.qml
+++ b/tabbox/qml/clients/thumbnails/contents/ui/main.qml
@@ -68,12 +68,14 @@ KWin.Switcher {
                 }
                 clip: true
                 delegate: Item {
-                    property alias data: thumbnailItem.data
+                    property alias caption: thumbnailItem.caption
+                    property alias icon: thumbnailItem.icon
                     id: delegateItem
                     width: thumbnailListView.thumbnailWidth
                     height: thumbnailListView.thumbnailWidth*(1.0/dialogMainItem.screenFactor)
                     KWin.ThumbnailItem {
-                        property variant data: model
+                        property variant caption: model.caption
+                        property variant icon: model.icon
                         id: thumbnailItem
                         wId: windowId
                         clip: true
@@ -118,7 +120,7 @@ KWin.Switcher {
                 }
                 QIconItem {
                     id: iconItem
-                    icon: thumbnailListView.currentItem ? thumbnailListView.currentItem.data.icon : ""
+                    icon: thumbnailListView.currentItem ? thumbnailListView.currentItem.icon : ""
                     width: 32
                     height: 32
                     anchors {
@@ -140,7 +142,7 @@ KWin.Switcher {
                     }
                     id: textItem
                     property int maxWidth: 0
-                    text: thumbnailListView.currentItem ? thumbnailListView.currentItem.data.caption : ""
+                    text: thumbnailListView.currentItem ? thumbnailListView.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
                     color: theme.textColor
diff --git a/tabbox/qml/desktops/previews/contents/ui/main.qml b/tabbox/qml/desktops/previews/contents/ui/main.qml
index dc0f2896df..6b709bd470 100644
--- a/tabbox/qml/desktops/previews/contents/ui/main.qml
+++ b/tabbox/qml/desktops/previews/contents/ui/main.qml
@@ -75,12 +75,12 @@ KWin.Switcher {
                     height: listView.thumbnailWidth*(1.0/screenFactor)
                 }
                 delegate: Item {
-                    property alias data: thumbnailItem.data
+                    property alias caption: thumbnailItem.caption
                     width: listView.thumbnailWidth
                     height: listView.thumbnailWidth*(1.0/screenFactor)
                     KWin.DesktopThumbnailItem {
                         id: thumbnailItem
-                        property variant data: model
+                        property variant caption: model.caption
                         clip: true
                         clipTo: listView
                         desktop: model.desktop
@@ -129,7 +129,7 @@ KWin.Switcher {
                     }
                     id: textItem
                     property int maxWidth: 0
-                    text: listView.currentItem ? listView.currentItem.data.caption : ""
+                    text: listView.currentItem ? listView.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
                     color: theme.textColor