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

diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp
index 70dedc9..bf49574 100644
--- a/src/devices/gui/register_view.cpp
+++ b/src/devices/gui/register_view.cpp
@@ -12,8 +12,8 @@
 #include "libgui/gui_debug_manager.h"
 
 //----------------------------------------------------------------------------
-Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *parent)
-  : KListViewItem(parent), _index(index), _bit(bit)
+Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *tqparent)
+  : KListViewItem(tqparent), _index(index), _bit(bit)
 {
   const Device::RegistersData *rdata = Main::deviceData()->registersData();
   setText(1, rdata->portBitName(_index, _bit));
@@ -22,8 +22,8 @@ Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListVi
 
 void Register::PortBitListViewItem::updateView()
 {
-  const QMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
-  QString text;
+  const TQMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
+  TQString text;
   if ( pdata.isEmpty() ) text = "--";
   else {
 /*
@@ -43,25 +43,25 @@ void Register::PortBitListViewItem::updateView()
     else text += (pdata[_bit].drivenState==Device::IoHigh ? "1" : "0");
   }
   setText(2, text);
-  repaint();
+  tqrepaint();
 }
 
-void Register::PortBitListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+void Register::PortBitListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
 {
-  QColorGroup ncg = cg;
-  const QMap<uint, Device::PortBitData> &data = Register::list().portData(_index);
-  const QMap<uint, Device::PortBitData> &odata = Register::list().oldPortData(_index);
+  TQColorGroup ncg = cg;
+  const TQMap<uint, Device::PortBitData> &data = Register::list().portData(_index);
+  const TQMap<uint, Device::PortBitData> &odata = Register::list().oldPortData(_index);
   bool changed = ( !data.isEmpty() && data[_bit]!=odata[_bit] );
-  if ( column==2 && changed ) ncg.setColor(QColorGroup::Text, red);
+  if ( column==2 && changed ) ncg.setColor(TQColorGroup::Text, red);
   KListViewItem::paintCell(p, ncg, column, width, align);
 }
 
-QString Register::PortBitListViewItem::tooltip(int col) const
+TQString Register::PortBitListViewItem::tooltip(int col) const
 {
-  if ( col!=2 ) return QString::null;
-  const QMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
-  if ( pdata.isEmpty() ) return QString::null;
-  QString s = text(1) + ": ";
+  if ( col!=2 ) return TQString();
+  const TQMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
+  if ( pdata.isEmpty() ) return TQString();
+  TQString s = text(1) + ": ";
   if (pdata[_bit].driving) {
     if ( pdata[_bit].drivingState!=Device::IoUnknown ) s += i18n("unknown state");
     else s += (pdata[_bit].drivingState==Device::IoHigh ? i18n("driving high") : i18n("driving low"));
@@ -75,8 +75,8 @@ QString Register::PortBitListViewItem::tooltip(int col) const
 }
 
 //-----------------------------------------------------------------------------
-Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent)
-  : EditListViewItem(parent), _data(data), _base(NumberBase::Hex)
+Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *tqparent)
+  : EditListViewItem(tqparent), _data(data), _base(NumberBase::Hex)
 {
   setSelectable(false);
   const Device::RegistersData *rdata = Main::deviceData()->registersData();
@@ -92,19 +92,19 @@ Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent
   }
 }
 
-QString Register::ListViewItem::text() const
+TQString Register::ListViewItem::text() const
 {
   BitValue value = Register::list().value(_data);
   uint nbChars = convertNbChars(_data.nbChars(), NumberBase::Hex, _base);
   return (value.isInitialized() ? toLabel(_base, value, nbChars) : "--");
 }
 
-int Register::ListViewItem::compare(QListViewItem *item, int, bool) const
+int Register::ListViewItem::compare(TQListViewItem *item, int, bool) const
 {
   const TypeData &data = static_cast<ListViewItem *>(item)->data();
-  int i1 = list().watched().findIndex(data);
+  int i1 = list().watched().tqfindIndex(data);
   Q_ASSERT( i1!=-1 );
-  int i2 = list().watched().findIndex(_data);
+  int i2 = list().watched().tqfindIndex(_data);
   Q_ASSERT( i2!=-1 );
   return ( i1-i2 );
 }
@@ -114,7 +114,7 @@ void Register::ListViewItem::updateView()
   if ( _data.type()!=Special ) setText(0, toHexLabel(_data.address(), nbCharsAddress()) + ":");
   setText(1, label());
   setText(2, text());
-  repaint();
+  tqrepaint();
   for (uint i=0; i<_items.count(); i++) _items[i]->updateView();
 }
 
@@ -124,38 +124,38 @@ void Register::ListViewItem::setBase(NumberBase base)
   updateView();
 }
 
-void Register::ListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+void Register::ListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
 {
-  QColorGroup ncg = cg;
+  TQColorGroup ncg = cg;
   BitValue value = Register::list().value(_data);
   BitValue oldValue = Register::list().oldValue(_data);
-  if ( column==2 && value!=oldValue ) ncg.setColor(QColorGroup::Text, red);
+  if ( column==2 && value!=oldValue ) ncg.setColor(TQColorGroup::Text, red);
   EditListViewItem::paintCell(p, ncg, column, width, align);
 }
 
-QString Register::ListViewItem::tooltip(int col) const
+TQString Register::ListViewItem::tooltip(int col) const
 {
-  if ( col!=2 ) return QString::null;
+  if ( col!=2 ) return TQString();
   BitValue value = Register::list().value(_data);
-  if ( !value.isInitialized() ) return QString::null;
+  if ( !value.isInitialized() ) return TQString();
   BitValue v = value;
-  QString s;
+  TQString s;
   for (uint i=0; i<_data.nbChars(); i++) {
     char c = v.nybble(i);
     if ( isprint(c) ) s = c + s;
     else s = "." + s;
   }
-  return QString("%1 - %2 - \"%3\"").arg(toHexLabel(value, _data.nbChars()))
-         .arg(toLabel(NumberBase::Bin, value, 4*_data.nbChars())).arg(s);
+  return TQString("%1 - %2 - \"%3\"").tqarg(toHexLabel(value, _data.nbChars()))
+         .tqarg(toLabel(NumberBase::Bin, value, 4*_data.nbChars())).tqarg(s);
 }
 
-QWidget *Register::ListViewItem::editWidgetFactory(int col) const
+TQWidget *Register::ListViewItem::editWidgetFactory(int col) const
 {
   if ( col!=2 || Main::programmerState()!=Programmer::Halted ) return 0;
   return new NumberLineEdit(text(), 0);
 }
 
-void Register::ListViewItem::editDone(int col, const QWidget *edit)
+void Register::ListViewItem::editDone(int col, const TQWidget *edit)
 {
   if ( col!=2 ) return;
   bool ok;
@@ -164,11 +164,11 @@ void Register::ListViewItem::editDone(int col, const QWidget *edit)
 }
 
 //----------------------------------------------------------------------------
-Register::LineEdit::LineEdit(QWidget *parent, const char *name)
-  : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types)
+Register::LineEdit::LineEdit(TQWidget *tqparent, const char *name)
+  : NumberLineEdit(tqparent, name), _base(NumberBase::Nb_Types)
 {
-  connect(this, SIGNAL(lostFocus()), SLOT(updateText()));
-  connect(this, SIGNAL(returnPressed()), SLOT(returnPressedSlot()));
+  connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText()));
+  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot()));
 }
 
 void Register::LineEdit::updateText()
@@ -176,7 +176,7 @@ void Register::LineEdit::updateText()
   setText(_value.isInitialized() ? toLabel(_base, _value, _nbChars) : "--");
   uint w = 2*frameWidth() + maxLabelWidth(_base, _nbChars, font());
   setFixedWidth(w+5);
-  setFixedHeight(minimumSizeHint().height());
+  setFixedHeight(tqminimumSizeHint().height());
 }
 
 void Register::LineEdit::setValue(NumberBase base, BitValue value, uint nbChars)
@@ -196,13 +196,13 @@ void Register::LineEdit::returnPressedSlot()
   emit modified();
 }
 
-void Register::LineEdit::keyPressEvent(QKeyEvent *e)
+void Register::LineEdit::keyPressEvent(TQKeyEvent *e)
 {
   if ( e->key()==Key_Escape ) clearFocus();
   else NumberLineEdit::keyPressEvent(e);
 }
 
 //----------------------------------------------------------------------------
-Register::View::View(QWidget *parent, const char *name)
- : QFrame(parent, name), GenericView(list())
+Register::View::View(TQWidget *tqparent, const char *name)
+ : TQFrame(tqparent, name), GenericView(list())
 {}