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

diff --git a/src/devices/pic/xml_data/24FJ128GA006.xml b/src/devices/pic/xml_data/24FJ128GA006.xml
index 7f264b9..a68bc37 100644
--- a/src/devices/pic/xml_data/24FJ128GA006.xml
+++ b/src/devices/pic/xml_data/24FJ128GA006.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x0157FB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x0157FC" end="0x0157FF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->