rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 93 insertions, 93 deletions

diff --git a/src/devices/pic/xml_data/18F4431.xml b/src/devices/pic/xml_data/18F4431.xml
index dc8edc0..c19b48a 100644
--- a/src/devices/pic/xml_data/18F4431.xml
+++ b/src/devices/pic/xml_data/18F4431.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
-    <tqmask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
+    <mask 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"    />
@@ -62,40 +62,40 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
-    </tqmask>
-    <tqmask name="FCMEN" value="0x40" >
+    </mask>
+    <mask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </tqmask>
-    <tqmask name="IESO"  value="0x80" >
+    </mask>
+    <mask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
+    <mask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRTEN_ON"  />
       <value value="0x01" name="Off" cname="_PWRTEN_OFF" />
-    </tqmask>
-    <tqmask name="BODEN" value="0x02" >
+    </mask>
+    <mask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOREN_OFF" />
       <value value="0x02" name="On"  cname="_BOREN_ON"  />
-    </tqmask>
-    <tqmask name="BORV"  value="0x0C" >
+    </mask>
+    <mask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
-    <tqmask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
+    <mask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDTEN_OFF" />
       <value value="0x01" name="On"  cname="_WDTEN_ON"  />
-    </tqmask>
-    <tqmask name="WDTPS" value="0x1E" >
+    </mask>
+    <mask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDPS_4"     />
@@ -112,160 +112,160 @@
       <value value="0x1A" name="1:8192"  cname="_WDPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDPS_32768" />
-    </tqmask>
-    <tqmask name="WINEN" value="0x20" >
+    </mask>
+    <mask name="WINEN" value="0x20" >
       <value value="0x00" name="On"  cname="_WINEN_ON"  />
       <value value="0x20" name="Off" cname="_WINEN_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
-    <tqmask name="PWMPIN"  value="0x04" >
+  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
+    <mask name="PWMPIN"  value="0x04" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x04" name="Off" cname="_PWMPIN_OFF" />
-    </tqmask>
-    <tqmask name="LPOL"    value="0x08" >
+    </mask>
+    <mask name="LPOL"    value="0x08" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x08" name="high" cname="_LPOL_HIGH" />
-    </tqmask>
-    <tqmask name="HPOL"    value="0x10" >
+    </mask>
+    <mask name="HPOL"    value="0x10" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x10" name="high" cname="_HPOL_HIGH" />
-    </tqmask>
-    <tqmask name="T1OSCMX" value="0x20" >
+    </mask>
+    <mask name="T1OSCMX" value="0x20" >
       <value value="0x00" name="Legacy"    cname="_T1OSCMX_OFF" />
       <value value="0x20" name="Low Power" cname="_T1OSCMX_ON"  />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
-    <tqmask name="FLTAMX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
+    <mask name="FLTAMX" value="0x01" >
       <value value="0x00" name="RD4" cname="_FLTAMX_RD4" />
       <value value="0x01" name="RC1" cname="_FLTAMX_RC1"  />
-    </tqmask>
-    <tqmask name="SSPMX" value="0x04" >
+    </mask>
+    <mask name="SSPMX" value="0x04" >
       <value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" />
       <value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7"  />
-    </tqmask>
-    <tqmask name="PWM4MX" value="0x08" >
+    </mask>
+    <mask name="PWM4MX" value="0x08" >
       <value value="0x00" name="RD5" cname="_PWM4MX_RD5" />
       <value value="0x08" name="RB5" cname="_PWM4MX_RB5"  />
-    </tqmask>
-    <tqmask name="EXCLKMX" value="0x10" >
+    </mask>
+    <mask name="EXCLKMX" value="0x10" >
       <value value="0x00" name="RD0" cname="_EXCLKMX_RD0" />
       <value value="0x10" name="RC3" cname="_EXCLKMX_RC3"  />
-    </tqmask>
-    <tqmask name="MCLRE" value="0x80" >
+    </mask>
+    <mask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
-    <tqmask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
+    <mask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </tqmask>
-    <tqmask name="LVP"    value="0x04" >
+    </mask>
+    <mask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </tqmask>
-    <tqmask name="DEBUG"  value="0x80" >
+    </mask>
+    <mask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
+    <mask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </tqmask>
-    <tqmask name="CP_1" value="0x02" >
+    </mask>
+    <mask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </tqmask>
-    <tqmask name="CP_2" value="0x04" >
+    </mask>
+    <mask name="CP_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </tqmask>
-    <tqmask name="CP_3" value="0x08" >
+    </mask>
+    <mask name="CP_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
-    <tqmask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
+    <mask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </tqmask>
-    <tqmask name="CPD" value="0x80" >
+    </mask>
+    <mask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
+    <mask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </tqmask>
-    <tqmask name="WRT_1" value="0x02" >
+    </mask>
+    <mask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </tqmask>
-    <tqmask name="WRT_2" value="0x04" >
+    </mask>
+    <mask name="WRT_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </tqmask>
-    <tqmask name="WRT_3" value="0x08" >
+    </mask>
+    <mask name="WRT_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
-    <tqmask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
+    <mask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </tqmask>
-    <tqmask name="WRTB" value="0x40" >
+    </mask>
+    <mask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </tqmask>
-    <tqmask name="WRTD" value="0x80" >
+    </mask>
+    <mask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
+    <mask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_1" value="0x02" >
+    </mask>
+    <mask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_2" value="0x04" >
+    </mask>
+    <mask name="EBTR_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_3" value="0x08" >
+    </mask>
+    <mask name="EBTR_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
-    <tqmask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
+    <mask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
 <!--* Packages *************************************************************-->