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

diff --git a/src/devices/pic/xml_data/18F86J50.xml b/src/devices/pic/xml_data/18F86J50.xml
index 44acae5..fa67e08 100644
--- a/src/devices/pic/xml_data/18F86J50.xml
+++ b/src/devices/pic/xml_data/18F86J50.xml
@@ -29,16 +29,16 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
-    <tqmask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
+    <mask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </tqmask>
-    <tqmask name="STVREN" value="0x20" >
+    </mask>
+    <mask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </tqmask>
-    <tqmask name="PLLDIV"  value="0x0E" >
+    </mask>
+    <mask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -47,47 +47,47 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </tqmask>
-    <tqmask name="XINST" value="0x40" >
+    </mask>
+    <mask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </tqmask>
-    <tqmask name="DEBUG" value="0x80" >
+    </mask>
+    <mask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
-    <tqmask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
+    <mask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
-    <tqmask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
+    <mask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </tqmask>
-    <tqmask name="FOSC2"  value="0x04" >
+    </mask>
+    <mask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </tqmask>
-    <tqmask name="FCMEN"  value="0x40" >
+    </mask>
+    <mask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </tqmask>
-    <tqmask name="IESO"  value="0x80" >
+    </mask>
+    <mask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </tqmask>
+     </mask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
+    <mask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,53 +104,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
-    <tqmask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+    <mask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </tqmask>
-    <tqmask name="EMB"  value="0x30" >
+    </mask>
+    <mask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </tqmask>
-    <tqmask name="BW"  value="0x40" >
+    </mask>
+    <mask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </tqmask>
-    <tqmask name="WAIT"  value="0x80" >
+    </mask>
+    <mask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
-    <tqmask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
+    <mask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </tqmask>
-    <tqmask name="ECCPMX" value="0x02" >
+    </mask>
+    <mask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </tqmask>
-    <tqmask name="PMPMX" value="0x04" >
+    </mask>
+    <mask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </tqmask>
-    <tqmask name="MSSPSEL" value="0x08" >
+    </mask>
+    <mask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </tqmask>
+    </mask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->