Rename a number of classes to enhance compatibility with KDE4

14 files changed, 77 insertions, 77 deletions

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index be7aba50..004f4c74 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -71,8 +71,8 @@ void colorRequester::init()
      connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() ));
      connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) ));
 
-     KAccel *accel = new KAccel( this );
-     accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
+     TDEAccel *accel = new TDEAccel( this );
+     accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
      accel->readSettings();
  }
 
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index ad33e4f4..6f79a85e 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>fileList</cstring>
             </property>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 58f7d667..e423a221 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -44,33 +44,33 @@
 
 #define CVSSERVICE_TIMEOUT 1000*60
 
-CVSService::CVSService(KActionCollection *ac)
+CVSService::CVSService(TDEActionCollection *ac)
 {
-  m_menu = new KPopupMenu();
-  KAction *action = new KAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
+  m_menu = new TDEPopupMenu();
+  TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
   action->plug(m_menu);
-  action = new KAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
+  action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
   action->plug(m_menu);
-  KPopupMenu *updateToMenu = new KPopupMenu(m_menu);
+  TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu);
   m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu);
-  action = new KAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
+  action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
   action->plug(updateToMenu);
-  action = new KAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
+  action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
   action->plug(updateToMenu);
-  action = new KAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
+  action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
   action->plug(m_menu);
   m_menu->insertSeparator();
-  action = new KAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
+  action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
   action->plug(m_menu);
-  action = new KAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
+  action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
   action->plug(m_menu);
-  action = new KAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
+  action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
   action->plug(m_menu);
-  action = new KAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
+  action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
   action->plug(m_menu);
   
   m_menu->insertSeparator();
-  action = new KAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
+  action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
   action->plug(m_menu);
     
   m_cvsJob = 0L;
diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h
index 4ff92cbe..5c12d91a 100644
--- a/quanta/components/cvsservice/cvsservice.h
+++ b/quanta/components/cvsservice/cvsservice.h
@@ -26,8 +26,8 @@
 #include "cvsservicedcopif.h"
 
 class TQTimer;
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
 class CvsJob_stub;
 class CvsService_stub;
 class Repository_stub;
@@ -49,7 +49,7 @@ public:
    *  since this class is a singleton you must use this function to access it
    *  @return the class pointer
    */
-  static CVSService* ref(KActionCollection *ac = 0L)
+  static CVSService* ref(TDEActionCollection *ac = 0L)
   {
     static CVSService *m_ref;
     if (!m_ref) m_ref = new CVSService(ac);
@@ -63,7 +63,7 @@ public:
   bool exists() {return !m_appId.isEmpty();}
   void setRepository(const TQString &repository);
   void setCurrentFile(const TQString &file) {m_defaultFile = file;}
-  KPopupMenu *menu() {return m_menu;}
+  TDEPopupMenu *menu() {return m_menu;}
 
 public slots:
   void slotUpdate();
@@ -97,12 +97,12 @@ private slots:
   void slotTimeout();
   
 private:
-  CVSService(KActionCollection *ac);
+  CVSService(TDEActionCollection *ac);
   void notInRepository();
   void startService();
 
   TQCString m_appId;
-  KPopupMenu *m_menu;
+  TDEPopupMenu *m_menu;
   Repository_stub *m_repository;
   CvsJob_stub *m_cvsJob;
   CvsService_stub *m_cvsService;
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index cd3b3e35..a5925c26 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -44,13 +44,13 @@ namespace BacktraceListviewColumns
 }
 
 BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view)
-  : KListViewItem(view)
+  : TDEListViewItem(view)
 {
 }
 
 
 BacktraceListview::BacktraceListview(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
 {
   int charwidth = this->fontMetrics().width("0");
   // If you change the order here, change the BacktraceListviewColumns enums above
@@ -103,7 +103,7 @@ void BacktraceListview::keyPressEvent(TQKeyEvent *e)
 
 void BacktraceListview::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void BacktraceListview::slotBacktraceDoubleClick(TQListViewItem *item, const TQPoint &, int )
diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h
index 0661af1a..4203cf70 100644
--- a/quanta/components/debugger/backtracelistview.h
+++ b/quanta/components/debugger/backtracelistview.h
@@ -33,7 +33,7 @@ enum BacktraceType
 };
 
 
-class BacktraceListviewItem : public KListViewItem
+class BacktraceListviewItem : public TDEListViewItem
 {
   private:
     BacktraceType m_type;
@@ -68,7 +68,7 @@ class BacktraceListviewItem : public KListViewItem
 
 };
 
-class BacktraceListview : public KListView
+class BacktraceListview : public TDEListView
 {
   Q_OBJECT
   
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index d490478d..c1074e9d 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -47,13 +47,13 @@ namespace DebuggerBreakpointViewColumns
 }
 
 DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* view)
-   : KListViewItem(view)
+   : TDEListViewItem(view)
 {
 }
 
 
 DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
   // If you change here, change the DebuggerBreakpointViewColumns enums above
   addColumn(i18n("Expression"));
@@ -66,10 +66,10 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam
   setResizeMode(TQListView::AllColumns);
   setAllColumnsShowFocus(true);
 
-  m_breakpointPopup = new KPopupMenu(this);
+  m_breakpointPopup = new TDEPopupMenu(this);
   m_breakpointPopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()));
 
-  connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 
   // Jump to bp
   connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int)));
@@ -165,7 +165,7 @@ void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e)
 
 void DebuggerBreakpointView::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &, int )
@@ -182,7 +182,7 @@ void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, con
 
 }
 
-void DebuggerBreakpointView::slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint& point)
+void DebuggerBreakpointView::slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point)
 {
   if(!selectedItem())
     return;
diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h
index 9724cec5..e6abcfcd 100644
--- a/quanta/components/debugger/debuggerbreakpointview.h
+++ b/quanta/components/debugger/debuggerbreakpointview.h
@@ -27,7 +27,7 @@
 // class DebuggerBreakpoint;
 class DebuggerBreakpointView;
 
-class DebuggerBreakpointViewItem : public KListViewItem
+class DebuggerBreakpointViewItem : public TDEListViewItem
 {
   private:
     DebuggerBreakpoint m_breakpoint;
@@ -41,7 +41,7 @@ class DebuggerBreakpointViewItem : public KListViewItem
 
 };
 
-class DebuggerBreakpointView : public KListView
+class DebuggerBreakpointView : public TDEListView
 {
   Q_OBJECT
   
@@ -59,7 +59,7 @@ class DebuggerBreakpointView : public KListView
 
   public slots:
     void slotRemoveSelected();
-    void slotBreakpointContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point);
+    void slotBreakpointContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point);
     void slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &point, int column);
 
   signals:
@@ -69,7 +69,7 @@ class DebuggerBreakpointView : public KListView
     void keyPressEvent(TQKeyEvent *e);
     TQListViewItem* findBreakpoint(const DebuggerBreakpoint& bp, bool addIfNotExist = true);
 
-    KPopupMenu *m_breakpointPopup;
+    TDEPopupMenu *m_breakpointPopup;
 };
 
 #endif
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index e9b9573a..bdab1245 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -206,71 +206,71 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
 
 void DebuggerManager::initActions()
 {
-  KAction * newaction;
-  KActionCollection *ac = quantaApp->actionCollection();
+  TDEAction * newaction;
+  TDEActionCollection *ac = quantaApp->actionCollection();
   if(!ac)
     return;
 
   //Debugger, breakpoint
-  newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
+  newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
   newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location"));
   
-  newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
+  newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
   newaction->setToolTip(i18n("Clears all breakpoints"));
   
-  newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
   
-  newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
 
   // Execution
-  newaction = new KAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request");
+  newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request");
   newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated"));
   
-  newaction = new KAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace");
+  newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace");
   newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started"));
   
-  newaction = new KAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run");
+  newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run");
   newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started"));
   
-  newaction = new KAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover");
+  newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover");
   newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes"));
   
-  newaction = new KAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
+  newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
   newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file"));
   
-  newaction = new KAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip");
+  newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip");
   newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one"));
   
-  newaction = new KAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout");
+  newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout");
   newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)"));
   
-  newaction = new KAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause");
+  newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause");
   newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started"));
-  newaction = new KAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill");
+  newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill");
   newaction->setToolTip(i18n("Kills the currently running script"));
   
-  newaction = new KAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect");
+  newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect");
   newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)"));
   
-  newaction = new KAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
+  newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
   newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)"));
 
   // Variables
-  newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set");
   newaction->setToolTip(i18n("Changes the value of a variable"));
   
-  newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
   newaction->setToolTip(i18n("Changes the value of a variable"));
 
-  newaction = new KAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
+  newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
   newaction->setToolTip(i18n("Opens the profiler output file"));
 
   enableAction("*", false);
@@ -340,7 +340,7 @@ void DebuggerManager::enableAction(const TQString& action, bool enable)
   else
   {
     // The action may or may not exist, depending on capabilities of the debugger plugin
-    KActionCollection *ac = quantaApp->actionCollection();
+    TDEActionCollection *ac = quantaApp->actionCollection();
     if(ac && ac->action(action.ascii()))
       ac->action(action.ascii())->setEnabled(enable);
   }
diff --git a/quanta/components/debugger/debuggervariable.h b/quanta/components/debugger/debuggervariable.h
index 50d28136..af78fde6 100644
--- a/quanta/components/debugger/debuggervariable.h
+++ b/quanta/components/debugger/debuggervariable.h
@@ -80,8 +80,8 @@ class DebuggerVariable
     virtual void touch() { m_touched = true;};
     virtual bool touched()  const { return m_touched;};
 
-    virtual void setItem(KListViewItem* item) { m_item = item;};
-    virtual KListViewItem*  item() const{  return m_item;};
+    virtual void setItem(TDEListViewItem* item) { m_item = item;};
+    virtual TDEListViewItem*  item() const{  return m_item;};
 
     virtual void copy(DebuggerVariable* v, bool copychldren = true);
     virtual void append(DebuggerVariable* v);
@@ -98,6 +98,6 @@ class DebuggerVariable
     int     m_type;
     long    m_touched;
 
-    KListViewItem* m_item;
+    TDEListViewItem* m_item;
 };
 #endif
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 40df91c0..04eb90a1 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -48,7 +48,7 @@ namespace VariablesListViewColumns
 }
 
 VariablesListView::VariablesListView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
   // If you change here, change the VariablesListViewColumns enums above
   addColumn(i18n("Name"));
@@ -59,7 +59,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   setRootIsDecorated(true);
   setSorting(-1); // No sorting
   
-  m_variablePopup = new KPopupMenu(this);
+  m_variablePopup = new TDEPopupMenu(this);
   m_variablePopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch);
 
   if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue))
@@ -69,7 +69,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   
   m_variablePopup->insertItem(SmallIcon("editcopy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
 
-  connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 }
 
 
@@ -144,7 +144,7 @@ void VariablesListView::addVariable(DebuggerVariable* variable)
   DebuggerVariable *newvar = new DebuggerVariable(variable);
   m_variablesList.append(newvar);
 
-  KListViewItem * item = new KListViewItem(this);
+  TDEListViewItem * item = new TDEListViewItem(this);
   insertItem(item);
   newvar->setItem(item);
   replaceVariable(newvar, variable);
@@ -152,13 +152,13 @@ void VariablesListView::addVariable(DebuggerVariable* variable)
 
 void VariablesListView::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
   m_variablesList.clear();
 }
 
 void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar)
 { 
-  KListViewItem * item;
+  TDEListViewItem * item;
   
   // Remove children that doesen't exist anymore
   TQPtrList<DebuggerVariable> oldlist = oldvar->values();
@@ -196,7 +196,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
     if(!found)
     {
       DebuggerVariable* child = new DebuggerVariable();
-      item = new KListViewItem(oldvar->item());
+      item = new TDEListViewItem(oldvar->item());
       child->setItem(item);
       replaceVariable( child, newchild);
       oldvar->append(child);
@@ -219,7 +219,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
   
 }
 
-void VariablesListView::slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint& point)
+void VariablesListView::slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point)
 {
   if(!selectedItem())
     return;
diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h
index af3db373..de837241 100644
--- a/quanta/components/debugger/variableslistview.h
+++ b/quanta/components/debugger/variableslistview.h
@@ -25,7 +25,7 @@
 
 class DebuggerVariable;
 
-class VariablesListView : public KListView
+class VariablesListView : public TDEListView
 {
   Q_OBJECT
   
@@ -55,7 +55,7 @@ class VariablesListView : public KListView
     void slotVariableSetValue();
     void slotVariableDump();
     void slotVariableCopyToClipboard();
-    void slotVariableContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point);
+    void slotVariableContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point);
 
   signals:
     void valueChanged(DebuggerVariable*);
@@ -66,7 +66,7 @@ class VariablesListView : public KListView
     void replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar);
 
     TQPtrList<DebuggerVariable> m_variablesList;
-    KPopupMenu *m_variablePopup;
+    TDEPopupMenu *m_variablePopup;
 };
 
 #endif
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index 60eb455e..c53d87b1 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -51,7 +51,7 @@ int newNum;
 TableEditor::TableEditor(TQWidget* parent, const char* name)
   : TableEditorS(parent, name)
 {
-  m_popup = new KPopupMenu();
+  m_popup = new TDEPopupMenu();
   m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell()));
   m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow()));
   //  m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol()));
diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h
index c97f9ca0..171cb9c1 100644
--- a/quanta/components/tableeditor/tableeditor.h
+++ b/quanta/components/tableeditor/tableeditor.h
@@ -23,7 +23,7 @@
 
 class TQSpinBox;
 class TQTable;
-class KPopupMenu;
+class TDEPopupMenu;
 class Tag;
 struct DTDStruct;
 class Node;
@@ -109,7 +109,7 @@ protected:
   int m_cellEditId;
   int m_col;
   int m_row;
-  KPopupMenu *m_popup;
+  TDEPopupMenu *m_popup;
   KURL m_baseURL;
   const DTDStruct *m_dtd;
   TQValueList<TQValueList<TableNode> > *m_tableDataTags;