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

diff --git a/src/devices/pic/xml_data/18F2515.xml b/src/devices/pic/xml_data/18F2515.xml
index fa07b14..89960ae 100644
--- a/src/devices/pic/xml_data/18F2515.xml
+++ b/src/devices/pic/xml_data/18F2515.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" 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="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="0x07" >
-    <tqmask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
+    <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"      />
@@ -53,42 +53,42 @@
       <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="0x1F" >
-    <tqmask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
+    <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="0x06" >
+    </mask>
+    <mask 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" />
-    </tqmask>
-    <tqmask name="BORV"  value="0x18" >
+    </mask>
+    <mask 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" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
-    <tqmask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
+    <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="0x1E" >
+    </mask>
+    <mask 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"     />
@@ -105,119 +105,119 @@
       <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" />
-    </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="0x83" ctqmask="0x01" >
-    <tqmask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
+    <mask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </tqmask>
-    <tqmask name="PBADEN"  value="0x02" >
+    </mask>
+    <mask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </tqmask>
-    <tqmask name="LPT1OSC" value="0x04" >
+    </mask>
+    <mask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </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="XINST"  value="0x40" >
+    </mask>
+    <mask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_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="0x07" >
-    <tqmask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
+    <mask name="CP_0" value="0x01" >
       <value value="0x00" name="0800: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>
+    </mask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
-    <tqmask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
+    <mask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
-    <tqmask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
+    <mask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800: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>
+    </mask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
-    <tqmask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
+    <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:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
-    <tqmask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
+    <mask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800: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>
+    </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:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
 <!--* Packages *************************************************************-->