Rename a number of classes to enhance compatibility with KDE4

6 files changed, 15 insertions, 15 deletions

diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index d2ff2f4..912423c 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -81,7 +81,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVecto
   }
 }
 
-Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *parent) const
+Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, TDEListViewItem *parent) const
 {
   return new Pic::RegisterListViewItem(data, parent);
 }
diff --git a/src/devices/pic/gui/pic_group_ui.h b/src/devices/pic/gui/pic_group_ui.h
index d5dba86..0bf20d8 100644
--- a/src/devices/pic/gui/pic_group_ui.h
+++ b/src/devices/pic/gui/pic_group_ui.h
@@ -21,7 +21,7 @@ public:
   virtual Register::View *createRegisterView(TQWidget *parent) const;
   virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const;
   virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const;
-  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const;
+  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, TDEListViewItem *parent) const;
 };
 
 } // namespace
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index ced7e11..219519f 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -37,11 +37,11 @@
 Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent)
 {
   button = new PopupButton(text, parent);
-  KActionCollection *ac = 0;
-  KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoStart()), ac);
+  TDEActionCollection *ac = 0;
+  TDEAction *a = new TDEAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoStart()), ac);
   actions.append(a);
   button->appendAction(a);
-  a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoEnd()), ac);
+  a = new TDEAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoEnd()), ac);
   actions.append(a);
   button->appendAction(a);
   label = new TQLabel(parent);
@@ -53,7 +53,7 @@ void Pic::MemoryEditorLegend::Data::setProtected(bool on)
   else label->unsetPalette();
 }
 
-bool Pic::MemoryEditorLegend::Data::hasAction(const KAction *action) const
+bool Pic::MemoryEditorLegend::Data::hasAction(const TDEAction *action) const
 {
   for (uint i=0; i<actions.count(); i++) if ( actions[i]==action ) return true;
   return false;
@@ -128,7 +128,7 @@ void Pic::MemoryEditorLegend::updateDisplay()
 void Pic::MemoryEditorLegend::gotoStart()
 {
   Address start = device().range(type()).start;
-  const KAction *action = static_cast<const KAction *>(sender());
+  const TDEAction *action = static_cast<const TDEAction *>(sender());
   if ( _boot.hasAction(action) ) {
     AddressRange r = memory().bootRange();
     emit setStartWord(r.start - start);
@@ -147,7 +147,7 @@ void Pic::MemoryEditorLegend::gotoStart()
 void Pic::MemoryEditorLegend::gotoEnd()
 {
   Address start = device().range(type()).start;
-  const KAction *action = static_cast<const KAction *>(sender());
+  const TDEAction *action = static_cast<const TDEAction *>(sender());
   if ( _boot.hasAction(action) ) {
     AddressRange r = memory().bootRange();
     emit setEndWord(r.end - start);
@@ -316,7 +316,7 @@ Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memo
 void Pic::MemoryUserIdEditor::init(bool first)
 {
   MemoryTypeRangeEditor::init(first);
-  _setToChecksum = new KToggleAction(i18n("Set to unprotected checksum"), 0, 0,
+  _setToChecksum = new TDEToggleAction(i18n("Set to unprotected checksum"), 0, 0,
     TQT_TQOBJECT(this), TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection());
   addAction(_setToChecksum);
   if ( readConfigEntry(BaseGlobalConfig::UserIdSetToChecksum).toBool() && memory().isClear(MemoryRangeType::UserId) ) {
diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h
index 7d0f857..558cefb 100644
--- a/src/devices/pic/gui/pic_memory_editor.h
+++ b/src/devices/pic/gui/pic_memory_editor.h
@@ -12,7 +12,7 @@
 
 #include <tqscrollbar.h>
 #include <tqgroupbox.h>
-class KToggleAction;
+class TDEToggleAction;
 
 #include "devices/gui/memory_editor.h"
 #include "devices/gui/hex_word_editor.h"
@@ -78,10 +78,10 @@ private:
     Data() : button(0), label(0) {}
     Data(const TQString &text, TQWidget *parent);
     void setProtected(bool on);
-    bool hasAction(const KAction *action) const;
+    bool hasAction(const TDEAction *action) const;
     PopupButton *button;
     TQLabel      *label;
-    TQValueVector<KAction *> actions;
+    TQValueVector<TDEAction *> actions;
   };
   Data _boot;
   TQValueVector<Data> _blocks;
@@ -175,7 +175,7 @@ private slots:
 
 private:
   bool _saveReadOnly;
-  KToggleAction *_setToChecksum;
+  TDEToggleAction *_setToChecksum;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index 820da6b..420a0fc 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -306,7 +306,7 @@ void Pic::RegisterView::stopWatchAllRegisters()
 }
 
 //----------------------------------------------------------------------------
-Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent)
+Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, TDEListViewItem *parent)
   : Register::ListViewItem(data, parent)
 {}
 
diff --git a/src/devices/pic/gui/pic_register_view.h b/src/devices/pic/gui/pic_register_view.h
index 9c2a654..11882c0 100644
--- a/src/devices/pic/gui/pic_register_view.h
+++ b/src/devices/pic/gui/pic_register_view.h
@@ -78,7 +78,7 @@ private:
 class RegisterListViewItem : public Register::ListViewItem
 {
 public:
-  RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent);
+  RegisterListViewItem(const Register::TypeData &data, TDEListViewItem *parent);
 
 private:
   virtual uint nbCharsAddress() const;