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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 5cbb5b1..37917c7 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -34,8 +34,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
   for(uint i=0; i<nbWords; ++i) {
     //qDebug("BinWordsEditor for config word #%i", i);
     //uint address = device().range(Device::MemoryConfig).start + device().addressIncrement(Device::MemoryConfig) * i;
-    //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).tqmasks.count());
-    if ( device().config()._words[i].tqmasks.count()==0 ) continue;
+    //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).masks.count());
+    if ( device().config()._words[i].masks.count()==0 ) continue;
     TQWidget *page = 0;
     if ( nbWords>1 ) {
       page = new TQWidget(tabw);
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index bfa55e4..82b24b7 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -123,11 +123,11 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd
   TQGridLayout *grid = new TQGridLayout(_top);
   grid->setColStretch(2, 1);
   const Config::Word &cword = device().config()._words[ci];
-  _combos.resize(cword.tqmasks.count());
+  _combos.resize(cword.masks.count());
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = cword.tqmasks[k];
-    TQLabel *label = new TQLabel(Config::tqmaskLabel(ctqmask.name) + ":", this);
+    const Config::Mask &ctqmask = cword.masks[k];
+    TQLabel *label = new TQLabel(Config::maskLabel(ctqmask.name) + ":", this);
     grid->addWidget(label, k, 0);
     label = new TQLabel(ctqmask.name, this);
     grid->addWidget(label, k, 1);
@@ -148,7 +148,7 @@ void Pic::ConfigWordEditor::setReadOnly(bool readOnly)
   if (_mdb) _mdb->setReadOnly(readOnly);
   const Config::Word &cword = device().config()._words[_configIndex];
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = cword.tqmasks[k];
+    const Config::Mask &ctqmask = cword.masks[k];
     _combos[k]->setEnabled(!readOnly && !ctqmask.value.isOverlapping(cword.ptqmask) && ctqmask.values.count()!=1);
   }
 }
@@ -158,7 +158,7 @@ void Pic::ConfigWordEditor::slotModified()
   BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
   //qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+    const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
     v = v.clearMaskBits(ctqmask.value);
     v |= ctqmask.values[_combos[k]->index()].value; // set value
   }
@@ -174,7 +174,7 @@ void Pic::ConfigWordEditor::updateDisplay()
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   //qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+    const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
     for (int i=ctqmask.values.count()-1; i>=0; i--) {
       if ( ctqmask.values[i].value.isInside(v) ) {
         if ( ctqmask.values[i].isValid() ) _combos[k]->setItem(i);