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

diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 1812bbf..5cbb5b1 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -8,20 +8,20 @@
  ***************************************************************************/
 #include "pic_config_editor.h"
 
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qapplication.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqapplication.h>
 
 #include "pic_config_word_editor.h"
 #include "common/common/misc.h"
 #include "common/gui/misc_gui.h"
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, QWidget *parent)
-  : Device::MemoryEditorGroup(&memory, parent, "pic_config_editor_widget"),
+Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent)
+  : Device::MemoryEditorGroup(&memory, tqparent, "pic_config_editor_widget"),
     MemoryCaster(MemoryRangeType::Config, memory)
 {
-  QHBoxLayout *hb = new QHBoxLayout(_top);
+  TQHBoxLayout *hb = new TQHBoxLayout(_top);
 
   TabWidget *tabw = 0;
   uint nbWords = device().nbWords(MemoryRangeType::Config);
@@ -34,18 +34,18 @@ 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).masks.count());
-    if ( device().config()._words[i].masks.count()==0 ) continue;
-    QWidget *page = 0;
+    //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;
+    TQWidget *page = 0;
     if ( nbWords>1 ) {
-      page = new QWidget(tabw);
+      page = new TQWidget(tabw);
       tabw->addTab(page, device().config()._words[i].name);
     } else {
-      page = new QGroupBox(this);
+      page = new TQGroupBox(this);
       hb->addWidget(page);
     }
-    QVBoxLayout *vbox = new QVBoxLayout(page, 10, 10);
-    QHBoxLayout *hbox = new QHBoxLayout(vbox);
+    TQVBoxLayout *vbox = new TQVBoxLayout(page, 10, 10);
+    TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
     ConfigWordEditor *we = new ConfigWordEditor(memory, i, withWordEditor, page);
     addEditor(we);
     hbox->addWidget(we);
@@ -55,8 +55,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
 }
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, QWidget *parent)
-  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, parent, "pic_config_editor")
+Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
+  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, tqparent, "pic_config_editor")
 {}
 
 void Pic::MemoryConfigEditor::init(bool first)