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

diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp
index 91625fb..dd606fc 100644
--- a/src/libgui/object_view.cpp
+++ b/src/libgui/object_view.cpp
@@ -22,8 +22,8 @@
 #include "common/gui/misc_gui.h"
 
 //-----------------------------------------------------------------------------
-Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, QWidget *parent)
-  : SimpleTextEditor(true, parent), _source(source), _ok(false), _created(0), _device(data)
+Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *tqparent)
+  : SimpleTextEditor(true, tqparent), _source(source), _ok(false), _created(0), _device(data)
 {
   setReadOnly(true);
   _view->setDynWordWrap(false);
@@ -36,12 +36,12 @@ Coff::BaseEditor::~BaseEditor()
 }
 
 //-----------------------------------------------------------------------------
-Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, QWidget *parent)
-  : BaseEditor(source, &data, parent), _provided(0)
+Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent)
+  : BaseEditor(source, &data, tqparent), _provided(0)
 {}
 
-Coff::CoffEditor::CoffEditor(const TextObject &object, QWidget *parent)
-  : BaseEditor(PURL::Url(), object.device(), parent), _provided(&object)
+Coff::CoffEditor::CoffEditor(const TextObject &object, TQWidget *tqparent)
+  : BaseEditor(PURL::Url(), object.device(), tqparent), _provided(&object)
 {}
 
 bool Coff::CoffEditor::open(const PURL::Url &url)
@@ -56,8 +56,8 @@ bool Coff::CoffEditor::open(const PURL::Url &url)
 }
 
 //-----------------------------------------------------------------------------
-Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, QWidget *parent)
-  : BaseEditor(source, 0, parent)
+Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, TQWidget *tqparent)
+  : BaseEditor(source, 0, tqparent)
 {}
 
 bool Coff::ObjectEditor::open(const PURL::Url &url)
@@ -68,13 +68,13 @@ bool Coff::ObjectEditor::open(const PURL::Url &url)
     _ok = _created->parse(*this);
   }
   if ( !_ok ) return setText(i18n("Error parsing object:\n") + error());
-  QString s = coff()->information().text() + "\n";
+  TQString s = coff()->information().text() + "\n";
   return setText(s);
 }
 
 //-----------------------------------------------------------------------------
-Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, QWidget *parent)
-  : BaseEditor(source, 0, parent)
+Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, TQWidget *tqparent)
+  : BaseEditor(source, 0, tqparent)
 {}
 
 bool Coff::LibraryEditor::open(const PURL::Url &url)
@@ -85,23 +85,23 @@ bool Coff::LibraryEditor::open(const PURL::Url &url)
     _ok = _created->parse(*this);
   }
   if ( !_ok ) return setText(i18n("Error parsing library:\n") + error());
-  QString s = coff()->information().text() + "\n";
+  TQString s = coff()->information().text() + "\n";
   if ( coff()->members().count()!=0 ) s += coff()->membersInformation().text() + "\n";
   if ( coff()->symbols().count()!=0 ) s += coff()->symbolsInformation().text() + "\n";
   return setText(s);
 }
 
 //-----------------------------------------------------------------------------
-DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, QWidget *parent)
-  : SimpleTextEditor(true, parent), _source(source), _device(data), _editor(0)
+DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent)
+  : SimpleTextEditor(true, tqparent), _source(source), _device(data), _editor(0)
 {
   setReadOnly(true);
   _view->setDynWordWrap(false);
   setView(&Main::compileLog());
 }
 
-DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, QWidget *parent)
-  : SimpleTextEditor(true, parent), _device(data), _editor(&e)
+DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *tqparent)
+  : SimpleTextEditor(true, tqparent), _device(data), _editor(&e)
 {
   setReadOnly(true);
   _view->setDynWordWrap(false);
@@ -123,11 +123,11 @@ bool DisassemblyEditor::open(const PURL::Url &url)
 
   Device::Memory *memory = 0;
   if ( _editor==0 ) {
-    log(Log::LineType::Information, i18n("Disassembling hex file: %1").arg(_source.pretty()));
+    log(Log::LineType::Information, i18n("Disassembling hex file: %1").tqarg(_source.pretty()));
     PURL::File file(_source, Main::compileLog());
     if ( !file.openForRead() ) return false;
     memory = _device.group().createMemory(_device);
-    QStringList errors, warnings;
+    TQStringList errors, warnings;
     Device::Memory::WarningTypes warningTypes;
     if ( !memory->load(file.stream(), errors, warningTypes, warnings) ) {
       delete memory;