Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

3 files changed, 20 insertions, 20 deletions

diff --git a/src/piklab-test/base/generator_check.cpp b/src/piklab-test/base/generator_check.cpp
index 5819188..f7ce96f 100644
--- a/src/piklab-test/base/generator_check.cpp
+++ b/src/piklab-test/base/generator_check.cpp
@@ -129,8 +129,8 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
     bool ok = false;
     for (uint i=0; i<config._words.count(); i++) {
       const Pic::Config::Word &cword = config._words[i];
-      for (uint k=0; k<cword.tqmasks.count(); k++) {
-        const Pic::Config::Mask &ctqmask = cword.tqmasks[k];
+      for (uint k=0; k<cword.masks.count(); k++) {
+        const Pic::Config::Mask &ctqmask = cword.masks[k];
         if ( l<ctqmask.values.count() ) {
           ok = true;
           if ( !ctqmask.values[l].name.isEmpty() ) _memory2->setConfigValue(ctqmask.name, ctqmask.values[l].name);
@@ -157,11 +157,11 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
       BitValue word1 = _memory1->word(Pic::MemoryRangeType::Config, i);
       BitValue word2 = _memory2->word(Pic::MemoryRangeType::Config, i);
       if ( word1==word2 ) continue;
-      for (uint k=0; k<cword.tqmasks.count(); k++) {
-        const Pic::Config::Mask &ctqmask = cword.tqmasks[k];
+      for (uint k=0; k<cword.masks.count(); k++) {
+        const Pic::Config::Mask &ctqmask = cword.masks[k];
         if ( ctqmask.value.isInside(cword.ptqmask) ) continue;
-        BitValue value1 = word1.tqmaskWith(ctqmask.value);
-        BitValue value2 = word2.tqmaskWith(ctqmask.value);
+        BitValue value1 = word1.maskWith(ctqmask.value);
+        BitValue value2 = word2.maskWith(ctqmask.value);
         if ( value1==value2 ) continue;
         TQString name1, name2;
         uint l1, l2;
@@ -173,7 +173,7 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
         if ( name1==name2 ) continue;
         TEST_FAILED_RETURN(TQString("Config bits are different in %1: set\"%2\"=(%3) != compiled=%4)")
                            .tqarg(ctqmask.name).tqarg(ctqmask.values[l2].name)
-                           .tqarg(toHexLabel(word2.tqmaskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.tqmaskWith(ctqmask.value), nbChars)))
+                           .tqarg(toHexLabel(word2.maskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(ctqmask.value), nbChars)))
       }
     }
   }
diff --git a/src/piklab-test/checksum/checksum_check.cpp b/src/piklab-test/checksum/checksum_check.cpp
index 86877c0..1a472ae 100644
--- a/src/piklab-test/checksum/checksum_check.cpp
+++ b/src/piklab-test/checksum/checksum_check.cpp
@@ -29,10 +29,10 @@ void ChecksumCheck::cleanup(const Device::Data &)
 }
 
 void ChecksumCheck::setProtection(const Pic::Data &data, const Pic::Checksum::Data &cdata,
-                                  const TQString &tqmaskName, const TQString &valueName)
+                                  const TQString &maskName, const TQString &valueName)
 {
   const Pic::Protection &protection = data.config().protection();
-  if ( !tqmaskName.isEmpty() && !valueName.isEmpty() ) _memory->setConfigValue(tqmaskName, valueName);
+  if ( !maskName.isEmpty() && !valueName.isEmpty() ) _memory->setConfigValue(maskName, valueName);
   if ( !valueName.isEmpty() ) _memory->setUserIdToUnprotectedChecksum();
   for (uint i=0; i<cdata.protectedMaskNames.count(); i++) {
     TQString pmName = cdata.protectedMaskNames[i];
@@ -54,21 +54,21 @@ bool ChecksumCheck::checkChecksum(BitValue checksum, const TQString &label)
   return true;
 }
 
-void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &tqmaskName, const TQString &valueName, bool &ok)
+void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &maskName, const TQString &valueName, bool &ok)
 {
   if ( !pdata.checksums().tqcontains(valueName) ) {
-    const Pic::Config::Mask *tqmask = pdata.config().findMask(tqmaskName);
+    const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName);
     TQString label = valueName + (tqmask ? "/" + tqmask->name : TQString());
     printf("Missing checksum for \"%s\"", label.latin1());
     return;
   }
   const Pic::Checksum::Data &cdata = pdata.checksums()[valueName];
   _memory->clear();
-  setProtection(pdata, cdata, tqmaskName, valueName);
-  if ( !checkChecksum(cdata.blankChecksum, tqmaskName + ":" + valueName + "/" + "blank") ) ok = false;
+  setProtection(pdata, cdata, maskName, valueName);
+  if ( !checkChecksum(cdata.blankChecksum, maskName + ":" + valueName + "/" + "blank") ) ok = false;
   _memory->checksumCheckFill();
-  setProtection(pdata, cdata, tqmaskName, valueName);
-  if ( !checkChecksum(cdata.checkChecksum, tqmaskName + ":" + valueName + "/" + "check") ) ok = false;
+  setProtection(pdata, cdata, maskName, valueName);
+  if ( !checkChecksum(cdata.checkChecksum, maskName + ":" + valueName + "/" + "check") ) ok = false;
 }
 
 bool ChecksumCheck::execute(const Device::Data &data)
@@ -83,13 +83,13 @@ bool ChecksumCheck::execute(const Device::Data &data)
       checkChecksum(pdata, TQString(), TQString(), ok);
       break;
     case Pic::Protection::BasicProtection: {
-      TQString tqmaskName = protection.tqmaskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code);
-      const Pic::Config::Mask *tqmask = pdata.config().findMask(tqmaskName);
+      TQString maskName = protection.maskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code);
+      const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName);
       Q_ASSERT(tqmask);
       for (uint i=0; i<tqmask->values.count(); i++) {
         TQString valueName = tqmask->values[i].name;
         if ( valueName.isEmpty() ) continue; // invalid value
-        checkChecksum(pdata, tqmaskName, valueName, ok);
+        checkChecksum(pdata, maskName, valueName, ok);
       }
       break;
     }
diff --git a/src/piklab-test/checksum/checksum_check.h b/src/piklab-test/checksum/checksum_check.h
index e56fd2b..7dc8c97 100644
--- a/src/piklab-test/checksum/checksum_check.h
+++ b/src/piklab-test/checksum/checksum_check.h
@@ -27,9 +27,9 @@ private:
   Pic::Memory *_memory;
 
   void setProtection(const Pic::Data &data, const Pic::Checksum::Data &cdata,
-                     const TQString &tqmaskName, const TQString &valueName);
+                     const TQString &maskName, const TQString &valueName);
   bool checkChecksum(BitValue checksum, const TQString &label);
-  void checkChecksum(const Pic::Data &data, const TQString &tqmaskName, const TQString &valueName, bool &ok);
+  void checkChecksum(const Pic::Data &data, const TQString &maskName, const TQString &valueName, bool &ok);
 };
 
 #endif