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

diff --git a/src/devices/pic/xml_data/30F2020.xml b/src/devices/pic/xml_data/30F2020.xml
index cad9c22..3aa30e9 100644
--- a/src/devices/pic/xml_data/30F2020.xml
+++ b/src/devices/pic/xml_data/30F2020.xml
@@ -27,77 +27,77 @@
   <memory name="code"           start="0x000000" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
-  <tqmask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
+  <mask name="WRTBS" value="0x0001" >
     <value value="0x0000" name="All" />
     <value value="0x0001" name="Off" />
-  </tqmask>
-  <tqmask name="BSSIZ"  value="0x0006" >
+  </mask>
+  <mask name="BSSIZ"  value="0x0006" >
     <value value="0x0000" name="0"  />
     <value value="0x0002" name="4096" />
     <value value="0x0004" name="1024" />
     <value value="0x0006" name="0"  />
-  </tqmask>
-  <tqmask name="BSSEC" value="0x0008" >
+  </mask>
+  <mask name="BSSEC" value="0x0008" >
     <value value="0x0000" name="High Security"     />
     <value value="0x0008" name="Standard Security" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
 
-<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
-  <tqmask name="WRTGS"  value="0x0001" >
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+  <mask name="WRTGS"  value="0x0001" >
     <value value="0x0000" name="All"  />
     <value value="0x0001" name="Off" />
-  </tqmask>
-  <tqmask name="GSSEC" value="0x0006" >
+  </mask>
+  <mask name="GSSEC" value="0x0006" >
     <value value="0x0000" name="High Security" />
     <value value="0x0002" name="High Security" />
     <value value="0x0004" name="Standard Security" />
     <value value="0x0006" name="Off" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
-  <tqmask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
+  <mask name="FNOSC" value="0x0003" >
     <value value="0x0000" name="INTRC_F" />
     <value value="0x0001" name="INTRC_F_PLL" />
     <value value="0x0002" name="PRIM" />
     <value value="0x0003" name="PRIM_PLL" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
-  <tqmask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+  <mask name="POSCMD" value="0x0003" >
     <value value="0x0000" name="EC" />
     <value value="0x0001" name="invalid" />
     <value value="0x0002" name="HS" />
     <value value="0x0003" name="Off" />
-  </tqmask>
-  <tqmask name="OSCIOFNC" value="0x0004" >
+  </mask>
+  <mask name="OSCIOFNC" value="0x0004" >
     <value value="0x0000" name="IO" />
     <value value="0x0004" name="Clock" />
-  </tqmask>
-  <tqmask name="FRANGE" value="0x0020" >
+  </mask>
+  <mask name="FRANGE" value="0x0020" >
     <value value="0x0000" name="Low range" />
     <value value="0x0020" name="High range" />
-  </tqmask>
-  <tqmask name="FCKSM" value="0x00C0" >
+  </mask>
+  <mask name="FCKSM" value="0x00C0" >
     <value value="0x0000" name="Switching on, monitor on" />
     <value value="0x0040" name="Switching on, monitor off" />
     <value value="0x0080" name="Switching off, monitor off" />
     <value value="0x00C0" name="Switching off, monitor off" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
-  <tqmask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+  <mask name="WDTPOST" value="0x000F" >
     <value value="0x0000" name="1:1" />
     <value value="0x0001" name="1:2" />
     <value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
     <value value="0x000D" name="1:8192" />
     <value value="0x000E" name="1:16384" />
     <value value="0x000F" name="1:32768" />
-  </tqmask>
-  <tqmask name="WDTPRE" value="0x0010" >
+  </mask>
+  <mask name="WDTPRE" value="0x0010" >
     <value value="0x0000" name="1:32" />
     <value value="0x0010" name="1:128" />
-  </tqmask>
-  <tqmask name="WINDIS" value="0x0040" >
+  </mask>
+  <mask name="WINDIS" value="0x0040" >
     <value value="0x0000" name="On" />
     <value value="0x0040" name="Off" />
-  </tqmask>
-  <tqmask name="FWDTEN" value="0x0080" >
+  </mask>
+  <mask name="FWDTEN" value="0x0080" >
     <value value="0x0000" name="Software" />
     <value value="0x0080" name="On" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
-  <tqmask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
+  <mask name="FPWRT" value="0x0007" >
     <value value="0x0000" name="0" />
     <value value="0x0001" name="2" />
     <value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
     <value value="0x0005" name="32" />
     <value value="0x0006" name="64" />
     <value value="0x0007" name="128" />
-  </tqmask>
+  </mask>
 </config>
 
-<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
-  <tqmask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
+  <mask name="ICS" value="0x0003" >
     <value value="0x0000" name="invalid" />
     <value value="0x0001" name="EMUC2, EMUD2" />
     <value value="0x0002" name="EMUC1, EMUD1" />
     <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
-  </tqmask>
-  <tqmask name="DEBUG" value="0x0080" >
+  </mask>
+  <mask name="DEBUG" value="0x0080" >
     <value value="0x0000" name="On" />
     <value value="0x0080" name="Off" />
-  </tqmask>
+  </mask>
 </config>
 
 <!--* Packages *************************************************************-->