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, 53 insertions, 53 deletions

diff --git a/src/devices/pic/xml_data/18F6393.xml b/src/devices/pic/xml_data/18F6393.xml
index bc778f4..bb48cbe 100644
--- a/src/devices/pic/xml_data/18F6393.xml
+++ b/src/devices/pic/xml_data/18F6393.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"         start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -56,42 +56,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -108,79 +108,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >