From 56688a228dfa4260f77829cd8c125da2edbec2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@digia.com>
Date: Wed, 22 May 2013 12:42:08 +0200
Subject: [PATCH] Namespace Qt extensions qt_ instead of wl_
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6882f1747fa42b11e795252cba169f65e2fe08e5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/3rdparty/wayland/extensions/brcm.xml           |  2 +-
 .../wayland/extensions/output-extension.xml        |  6 +++---
 .../wayland/extensions/qtkey-extension.xml         |  2 +-
 .../wayland/extensions/sub-surface-extension.xml   | 14 +++++++-------
 .../wayland/extensions/surface-extension.xml       |  6 +++---
 .../wayland/extensions/touch-extension.xml         |  2 +-
 src/3rdparty/wayland/extensions/windowmanager.xml  |  2 +-
 src/3rdparty/wayland/extensions/xcomposite.xml     |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/3rdparty/wayland/extensions/brcm.xml b/src/3rdparty/wayland/extensions/brcm.xml
index 862026d0dc5..4c8e188dad9 100644
--- a/src/3rdparty/wayland/extensions/brcm.xml
+++ b/src/3rdparty/wayland/extensions/brcm.xml
@@ -39,7 +39,7 @@
 
  $QT_END_LICENSE$
     </copyright>
-  <interface name="wl_brcm" version="1">
+  <interface name="qt_brcm" version="1">
 
     <!-- Create a wayland buffer wrapping a global image. -->
     <request name="create_buffer">
diff --git a/src/3rdparty/wayland/extensions/output-extension.xml b/src/3rdparty/wayland/extensions/output-extension.xml
index 0ca8214e6e3..07aa1102cd5 100644
--- a/src/3rdparty/wayland/extensions/output-extension.xml
+++ b/src/3rdparty/wayland/extensions/output-extension.xml
@@ -38,14 +38,14 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_output_extension" version="1">
+    <interface name="qt_output_extension" version="1">
         <request name="get_extended_output">
-            <arg name="id" type="new_id" interface="wl_extended_output"/>
+            <arg name="id" type="new_id" interface="qt_extended_output"/>
             <arg name="output" type="object" interface="wl_output"/>
         </request>
     </interface>
 
-    <interface name="wl_extended_output" version="1">
+    <interface name="qt_extended_output" version="1">
         <enum name="rotation">
             <entry name="PortraitOrientation" value="1"/>
             <entry name="LandscapeOrientation" value="2"/>
diff --git a/src/3rdparty/wayland/extensions/qtkey-extension.xml b/src/3rdparty/wayland/extensions/qtkey-extension.xml
index e90c331902a..1d0db59dfaf 100644
--- a/src/3rdparty/wayland/extensions/qtkey-extension.xml
+++ b/src/3rdparty/wayland/extensions/qtkey-extension.xml
@@ -38,7 +38,7 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_qtkey_extension" version="1">
+    <interface name="qt_key_extension" version="1">
         <event name="qtkey">
           <description summary="qtkey event">
              Serialized QKeyEvent
diff --git a/src/3rdparty/wayland/extensions/sub-surface-extension.xml b/src/3rdparty/wayland/extensions/sub-surface-extension.xml
index 41f1816e460..0a6dcfbc74b 100644
--- a/src/3rdparty/wayland/extensions/sub-surface-extension.xml
+++ b/src/3rdparty/wayland/extensions/sub-surface-extension.xml
@@ -38,32 +38,32 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_sub_surface_extension" version="1">
+    <interface name="qt_sub_surface_extension" version="1">
         <request name="get_sub_surface_aware_surface">
-            <arg name="id" type="new_id" interface="wl_sub_surface"/>
+            <arg name="id" type="new_id" interface="qt_sub_surface"/>
             <arg name="surface" type="object" interface="wl_surface"/>
         </request>
     </interface>
 
-    <interface name="wl_sub_surface" version="1">
+    <interface name="qt_sub_surface" version="1">
         <request name="attach_sub_surface">
-            <arg name="sub_surface" type="object" interface="wl_sub_surface"/>
+            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
             <arg name="x" type="int"/>
             <arg name="y" type="int"/>
         </request>
 
         <request name="move_sub_surface">
-            <arg name="sub_surface" type="object" interface="wl_sub_surface"/>
+            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
             <arg name="x" type="int"/>
             <arg name="y" type="int"/>
         </request>
 
         <request name="raise">
-            <arg name="sub_surface" type="object" interface="wl_sub_surface"/>
+            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
         </request>
 
         <request name="lower">
-            <arg name="sub_surface" type="object" interface="wl_sub_surface"/>
+            <arg name="sub_surface" type="object" interface="qt_sub_surface"/>
         </request>
     </interface>
 </protocol>
diff --git a/src/3rdparty/wayland/extensions/surface-extension.xml b/src/3rdparty/wayland/extensions/surface-extension.xml
index c99f63b6c89..269b4390d7f 100644
--- a/src/3rdparty/wayland/extensions/surface-extension.xml
+++ b/src/3rdparty/wayland/extensions/surface-extension.xml
@@ -38,14 +38,14 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_surface_extension" version="1">
+    <interface name="qt_surface_extension" version="1">
         <request name="get_extended_surface">
-            <arg name="id" type="new_id" interface="wl_extended_surface"/>
+            <arg name="id" type="new_id" interface="qt_extended_surface"/>
             <arg name="surface" type="object" interface="wl_surface"/>
         </request>
     </interface>
 
-    <interface name="wl_extended_surface" version="1">
+    <interface name="qt_extended_surface" version="1">
         <event name="onscreen_visibility">
 	    <arg name="visible" type="int"/>
 	</event>
diff --git a/src/3rdparty/wayland/extensions/touch-extension.xml b/src/3rdparty/wayland/extensions/touch-extension.xml
index 1efb8930deb..92aefc670e8 100644
--- a/src/3rdparty/wayland/extensions/touch-extension.xml
+++ b/src/3rdparty/wayland/extensions/touch-extension.xml
@@ -38,7 +38,7 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_touch_extension" version="1">
+    <interface name="qt_touch_extension" version="1">
       <event name="touch">
         <arg name="time" type="uint" />
         <arg name="id" type="uint" />
diff --git a/src/3rdparty/wayland/extensions/windowmanager.xml b/src/3rdparty/wayland/extensions/windowmanager.xml
index 4d789e51a46..dbec4f1d6bc 100644
--- a/src/3rdparty/wayland/extensions/windowmanager.xml
+++ b/src/3rdparty/wayland/extensions/windowmanager.xml
@@ -38,7 +38,7 @@
  $QT_END_LICENSE$
     </copyright>
 
-    <interface name="wl_windowmanager" version="1">
+    <interface name="qt_windowmanager" version="1">
         <request name="map_client_to_process">
             <arg name="processid" type="uint" />
         </request>
diff --git a/src/3rdparty/wayland/extensions/xcomposite.xml b/src/3rdparty/wayland/extensions/xcomposite.xml
index 47a91087071..e7eb2b85afb 100644
--- a/src/3rdparty/wayland/extensions/xcomposite.xml
+++ b/src/3rdparty/wayland/extensions/xcomposite.xml
@@ -39,7 +39,7 @@
 
  $QT_END_LICENSE$
     </copyright>
-  <interface name="wl_xcomposite" version="1">
+  <interface name="qt_xcomposite" version="1">
 
     <!-- Create a wayland buffer for X Window. -->
     <request name="create_buffer">