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

diff --git a/src/devices/pic/xml_data/18F6720.xml b/src/devices/pic/xml_data/18F6720.xml
index a609ee9..c023b5e 100644
--- a/src/devices/pic/xml_data/18F6720.xml
+++ b/src/devices/pic/xml_data/18F6720.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x01FFFF" 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="0x0003FF" 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="0x27" >
-    <tqmask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
+    <mask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </tqmask>
-    <tqmask name="OSCSEN" value="0x20" >
+    </mask>
+    <mask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </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="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </tqmask>
-    <tqmask name="BODEN" value="0x02" >
+    </mask>
+    <mask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_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="0x0F" >
-    <tqmask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
+    <mask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </tqmask>
-    <tqmask name="WDTPS" value="0x0E" >
+    </mask>
+    <mask name="WDTPS" value="0x0E" >
       <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"   />
@@ -92,171 +92,171 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
-    <tqmask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
+    <mask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_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="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_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="0xFF" >
-    <tqmask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
+    <mask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" 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="4000:7FFF" 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="8000:BFFF" 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="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </tqmask>
-    <tqmask name="CP_4" value="0x10" >
+    </mask>
+    <mask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </tqmask>
-    <tqmask name="CP_5" value="0x20" >
+    </mask>
+    <mask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </tqmask>
-    <tqmask name="CP_6" value="0x40" >
+    </mask>
+    <mask name="CP_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
       <value value="0x40" name="Off"         cname="_CP6_OFF" />
-    </tqmask>
-    <tqmask name="CP_7" value="0x80" >
+    </mask>
+    <mask name="CP_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
       <value value="0x80" name="Off"         cname="_CP7_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="0xFF" >
-    <tqmask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
+    <mask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" 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="4000:7FFF" 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="8000:BFFF" 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="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </tqmask>
-    <tqmask name="WRT_4" value="0x10" >
+    </mask>
+    <mask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </tqmask>
-    <tqmask name="WRT_5" value="0x20" >
+    </mask>
+    <mask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </tqmask>
-    <tqmask name="WRT_6" value="0x40" >
+    </mask>
+    <mask name="WRT_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
       <value value="0x40" name="Off"         cname="_WRT6_OFF" />
-    </tqmask>
-    <tqmask name="WRT_7" value="0x80" >
+    </mask>
+    <mask name="WRT_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
       <value value="0x80" name="Off"         cname="_WRT7_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="0xFF" >
-    <tqmask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
+    <mask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" 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="4000:7FFF" 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="8000:BFFF" 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="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_4" value="0x10" >
+    </mask>
+    <mask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_5" value="0x20" >
+    </mask>
+    <mask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_6" value="0x40" >
+    </mask>
+    <mask name="EBTR_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
       <value value="0x40" name="Off"         cname="_EBTR6_OFF" />
-    </tqmask>
-    <tqmask name="EBTR_7" value="0x80" >
+    </mask>
+    <mask name="EBTR_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
       <value value="0x80" name="Off"         cname="_EBTR7_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 *************************************************************-->