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

1 files changed, 29 insertions, 29 deletions

diff --git a/src/devices/pic/xml_data/16F87.xml b/src/devices/pic/xml_data/16F87.xml
index 835b481..987ef0c 100644
--- a/src/devices/pic/xml_data/16F87.xml
+++ b/src/devices/pic/xml_data/16F87.xml
@@ -34,23 +34,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -59,52 +59,52 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"    value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"    value="0x0600" >
       <value value="0x0000" name="All"     cname="_WRT_PROTECT_ALL"  />
       <value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" />
       <value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256"  />
       <value value="0x0600" name="Off"     cname="_WRT_PROTECT_OFF"  />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP1MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP1MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP1_RB3" />
       <value value="0x1000" name="RB0" cname="_CCP1_RB0" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" >
-    <mask name="FCMEN" value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" >
+    <tqmask name="FCMEN" value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->