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

diff --git a/src/devices/pic/xml_data/24HJ128GP310.xml b/src/devices/pic/xml_data/24HJ128GP310.xml
index 8e148b0..a600601 100644
--- a/src/devices/pic/xml_data/24HJ128GP310.xml
+++ b/src/devices/pic/xml_data/24HJ128GP310.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
-    <tqmask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
+    <mask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </tqmask>
-    <tqmask name="BSSIZ"  value="0x06" >
+    </mask>
+    <mask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </tqmask>
-    <tqmask name="BSSEC" value="0x08" >
+    </mask>
+    <mask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </tqmask>
-    <tqmask name="RBSSIZ" value="0xC0" >
+    </mask>
+    <mask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
-    <tqmask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
+    <mask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </tqmask>
-    <tqmask name="SSSIZ"  value="0x06" >
+    </mask>
+    <mask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </tqmask>
-    <tqmask name="SSSEC" value="0x08" >
+    </mask>
+    <mask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </tqmask>
-    <tqmask name="RSSSIZ" value="0xC0" >
+    </mask>
+    <mask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
-    <tqmask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
+    <mask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </tqmask>
-    <tqmask name="GSSEC" value="0x06" >
+    </mask>
+    <mask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
-    <tqmask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
+    <mask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </tqmask>
-    <tqmask name="TEMP" value="0x20" >
+    </mask>
+    <mask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </tqmask>
-    <tqmask name="IESO" value="0x80" >
+    </mask>
+    <mask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
-    <tqmask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
+    <mask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </tqmask>
-    <tqmask name="OSCIOFNC" value="0x04" >
+    </mask>
+    <mask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </tqmask>
-    <tqmask name="FCKSM" value="0xC0" >
+    </mask>
+    <mask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
-    <tqmask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
+    <mask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </tqmask>
-    <tqmask name="WDTPRE" value="0x10" >
+    </mask>
+    <mask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </tqmask>
-    <tqmask name="WINDIS" value="0x40" >
+    </mask>
+    <mask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </tqmask>
-    <tqmask name="FWDTEN" value="0x80" >
+    </mask>
+    <mask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
-    <tqmask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
+    <mask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
-    <tqmask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
+    <mask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </tqmask>
-    <tqmask name="JTAGEN" value="0x20" >
+    </mask>
+    <mask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </tqmask>
-    <tqmask name="COE" value="0x40" >
+    </mask>
+    <mask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </tqmask>
-    <tqmask name="DEBUG" value="0x80" >
+    </mask>
+    <mask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </tqmask>
+    </mask>
   </config>
 
 <!--* Packages *************************************************************-->