From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 30 Jun 2011 00:15:53 +0000
Subject: TQt4 port piklab This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/devices/pic/xml_data/pic.xsd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/devices/pic/xml_data/pic.xsd')

diff --git a/src/devices/pic/xml_data/pic.xsd b/src/devices/pic/xml_data/pic.xsd
index f358f68..52d1bb2 100644
--- a/src/devices/pic/xml_data/pic.xsd
+++ b/src/devices/pic/xml_data/pic.xsd
@@ -225,9 +225,9 @@
     <xs:attribute name="name"           type="memory_type"   use="required"/>
     <xs:attribute name="start"          type="hex"           use="required"/>
     <xs:attribute name="end"            type="hex"           use="required"/>
-    <xs:attribute name="cal_opmask"     type="hex"                         />
+    <xs:attribute name="cal_optqmask"     type="hex"                         />
     <xs:attribute name="cal_opcode"     type="hex"                         />
-    <xs:attribute name="rmask"          type="hex"                         />
+    <xs:attribute name="rtqmask"          type="hex"                         />
     <xs:attribute name="hexfile_offset" type="hexfile_offset"              />
   </xs:complexType>
 
@@ -246,14 +246,14 @@
   </xs:complexType>
   <xs:complexType name="ConfigType">
     <xs:sequence>
-      <xs:element name="mask" type="MaskType" maxOccurs="unbounded"/>
+      <xs:element name="tqmask" type="MaskType" maxOccurs="unbounded"/>
     </xs:sequence>
     <xs:attribute name="name"    type="xs:string" use="required"/>
     <xs:attribute name="offset"  type="hex"       use="required"/>
-    <xs:attribute name="wmask"   type="hex"       use="required"/>
+    <xs:attribute name="wtqmask"   type="hex"       use="required"/>
     <xs:attribute name="bvalue"  type="hex"       use="required"/>
-    <xs:attribute name="cmask"   type="hex"                     />
-    <xs:attribute name="pmask"   type="hex"                     />
+    <xs:attribute name="ctqmask"   type="hex"                     />
+    <xs:attribute name="ptqmask"   type="hex"                     />
     <xs:attribute name="icnames" type="cnames"                  />
   </xs:complexType>
 
-- 
cgit v1.2.1