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

diff --git a/src/devices/pic/xml_data/30F6012.xml b/src/devices/pic/xml_data/30F6012.xml
index 7d5f9b5..e7c1797 100644
--- a/src/devices/pic/xml_data/30F6012.xml
+++ b/src/devices/pic/xml_data/30F6012.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <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="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
-    <tqmask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
+    <mask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </tqmask>
-    <tqmask name="FOS"   value="0x0300" >
+    </mask>
+    <mask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </tqmask>
-    <tqmask name="FCKSM" value="0xC000" >
+    </mask>
+    <mask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
-    <tqmask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
+    <mask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,72 +85,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </tqmask>
-    <tqmask name="FWPSA"  value="0x0030" >
+    </mask>
+    <mask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </tqmask>
-    <tqmask name="FWDTEN" value="0x8000" >
+    </mask>
+    <mask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
-    <tqmask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
+    <mask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </tqmask>
-    <tqmask name="BORV"  value="0x0030" >
+    </mask>
+    <mask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </tqmask>
-    <tqmask name="BODEN" value="0x0080" >
+    </mask>
+    <mask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </tqmask>
-    <tqmask name="MCLRE" value="0x8000" >
+    </mask>
+    <mask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
-    <tqmask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
+    <mask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </tqmask>
-    <tqmask name="GCP"  value="0x0002" >
+    </mask>
+    <mask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
-    <tqmask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
+    <mask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </tqmask>
-    <tqmask name="COE"   value="0x4000" >
+    </mask>
+    <mask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </tqmask>
-    <tqmask name="DEBUG" value="0x8000" >
+    </mask>
+    <mask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </tqmask>
+    </mask>
   </config>
 
 <!--* Packages *************************************************************-->