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

diff --git a/src/devices/pic/xml_data/16F887.xml b/src/devices/pic/xml_data/16F887.xml
index bbfdf91..78be11e 100644
--- a/src/devices/pic/xml_data/16F887.xml
+++ b/src/devices/pic/xml_data/16F887.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="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" wtqmask="0x3FFF" bvalue="0x3FFF" >
-    <tqmask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </tqmask>
-    <tqmask name="WDT"   value="0x0008" >
+    </mask>
+    <mask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </tqmask>
-    <tqmask name="PWRTE" value="0x0010" >
+    </mask>
+    <mask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </tqmask>
-    <tqmask name="MCLRE" value="0x0020" >
+    </mask>
+    <mask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </tqmask>
-    <tqmask name="CP"    value="0x0040" >
+    </mask>
+    <mask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </tqmask>
-    <tqmask name="CPD"   value="0x0080" >
+    </mask>
+    <mask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </tqmask>
-    <tqmask name="BODEN" value="0x0300" >
+    </mask>
+    <mask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </tqmask>
-    <tqmask name="IESO"  value="0x0400" >
+    </mask>
+    <mask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </tqmask>
-    <tqmask name="FCMEN" value="0x0800" >
+    </mask>
+    <mask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </tqmask>
-    <tqmask name="LVP"   value="0x1000" >
+    </mask>
+    <mask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </tqmask>
-    <tqmask name="DEBUG" value="0x2000" >
+    </mask>
+    <mask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
-    <tqmask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
+    <mask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </tqmask>
-    <tqmask name="WRT"  value="0x0600" >
+    </mask>
+    <mask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </tqmask>
+    </mask>
   </config>
 
 <!--* Packages *************************************************************-->