TQt4 port piklab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 56 insertions, 56 deletions

diff --git a/src/devices/pic/xml_data/30F6013A.xml b/src/devices/pic/xml_data/30F6013A.xml
index e0a5758..ff382ea 100644
--- a/src/devices/pic/xml_data/30F6013A.xml
+++ b/src/devices/pic/xml_data/30F6013A.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF800" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask 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"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask 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"  />
@@ -81,125 +81,125 @@
       <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" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask 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" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask 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"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask 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" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask 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="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->