Rename a number of classes to enhance compatibility with KDE4

5 files changed, 16 insertions, 16 deletions

diff --git a/src/devices/gui/device_group_ui.h b/src/devices/gui/device_group_ui.h
index 7b76186..54272d8 100644
--- a/src/devices/gui/device_group_ui.h
+++ b/src/devices/gui/device_group_ui.h
@@ -11,9 +11,9 @@
 
 #include <tqpixmap.h>
 class TQWidget;
-class KPopupMenu;
-class KListViewItem;
-class KAction;
+class TDEPopupMenu;
+class TDEListViewItem;
+class TDEAction;
 
 #include "devices/base/generic_device.h"
 #include "devices/base/device_group.h"
@@ -35,7 +35,7 @@ public:
   virtual Register::View *createRegisterView(TQWidget *parent) const = 0;
   virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const = 0;
   virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const = 0;
-  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const = 0;
+  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, TDEListViewItem *parent) const = 0;
 };
 
 inline const Device::GroupUI &groupui(const Device::Data &data) { return static_cast<const Device::GroupUI &>(*data.group().gui()); }
diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index bee291e..5e71ddb 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -299,7 +299,7 @@ void Device::MemoryTypeEditor::init(bool first)
   _title = new PopupButton(this);
   for (uint i=0; i<Nb_Actions; i++) {
     if ( hasAction(Action(i)) ) {
-      _actions[i] = new KAction(i18n(ACTION_DATA[i].label), ACTION_DATA[i].icon, 0,
+      _actions[i] = new TDEAction(i18n(ACTION_DATA[i].label), ACTION_DATA[i].icon, 0,
                                 TQT_TQOBJECT(this), TQT_SLOT(doAction()), Main::toplevel().actionCollection());
       addAction(_actions[i]);
     }
@@ -315,7 +315,7 @@ void Device::MemoryTypeEditor::init(bool first)
   connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(stateChanged()));
 }
 
-void Device::MemoryTypeEditor::addAction(KAction *action)
+void Device::MemoryTypeEditor::addAction(TDEAction *action)
 {
   _title->appendAction(action);
 }
diff --git a/src/devices/gui/memory_editor.h b/src/devices/gui/memory_editor.h
index 78bb5a6..89f4fb2 100644
--- a/src/devices/gui/memory_editor.h
+++ b/src/devices/gui/memory_editor.h
@@ -17,7 +17,7 @@
 class TQVBoxLayout;
 class TQHBoxLayout;
 class TQHBox;
-class KAction;
+class TDEAction;
 class PopupButton;
 
 namespace Device
@@ -145,12 +145,12 @@ protected:
   const HexView *_hexview;
   virtual bool internalDoAction(Action action) = 0; // return true if memory modified
   virtual bool hasAction(Action) const { return true; }
-  void addAction(KAction *action);
+  void addAction(TDEAction *action);
   const Device::Memory *originalMemory() const;
 
 private:
   bool     _readOnly;
-  KAction *_actions[Nb_Actions];
+  TDEAction *_actions[Nb_Actions];
 
   void doAction(Action action);
 };
diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp
index bd444c9..a290508 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, TDEListViewItem *parent)
+  : TDEListViewItem(parent), _index(index), _bit(bit)
 {
   const Device::RegistersData *rdata = Main::deviceData()->registersData();
   setText(1, rdata->portBitName(_index, _bit));
@@ -53,7 +53,7 @@ void Register::PortBitListViewItem::paintCell(TQPainter *p, const TQColorGroup &
   const TQMap<uint, Device::PortBitData> &odata = Register::list().oldPortData(_index);
   bool changed = ( !data.isEmpty() && data[_bit]!=odata[_bit] );
   if ( column==2 && changed ) ncg.setColor(TQColorGroup::Text, red);
-  KListViewItem::paintCell(p, ncg, column, width, align);
+  TDEListViewItem::paintCell(p, ncg, column, width, align);
 }
 
 TQString Register::PortBitListViewItem::tooltip(int col) const
@@ -75,7 +75,7 @@ TQString Register::PortBitListViewItem::tooltip(int col) const
 }
 
 //-----------------------------------------------------------------------------
-Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent)
+Register::ListViewItem::ListViewItem(const TypeData &data, TDEListViewItem *parent)
   : EditListViewItem(parent), _data(data), _base(NumberBase::Hex)
 {
   setSelectable(false);
diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h
index c69eeac..f3cb11d 100644
--- a/src/devices/gui/register_view.h
+++ b/src/devices/gui/register_view.h
@@ -20,10 +20,10 @@ namespace Register
 enum { PortBitRtti = 1000, RegisterRtti = 1001 };
 
 //-----------------------------------------------------------------------------
-class PortBitListViewItem : public KListViewItem
+class PortBitListViewItem : public TDEListViewItem
 {
 public:
-  PortBitListViewItem(uint address, uint bit, KListViewItem *parent);
+  PortBitListViewItem(uint address, uint bit, TDEListViewItem *parent);
   virtual int rtti() const { return PortBitRtti; }
   void updateView();
   TQString tooltip(int column) const;
@@ -38,7 +38,7 @@ private:
 class ListViewItem : public EditListViewItem
 {
 public:
-  ListViewItem(const TypeData &data, KListViewItem *item);
+  ListViewItem(const TypeData &data, TDEListViewItem *item);
   virtual int rtti() const { return RegisterRtti; }
   virtual void updateView();
   const TypeData &data() const { return _data; }