Rename a number of classes to enhance compatibility with KDE4

5 files changed, 38 insertions, 38 deletions

diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index c985fabb..7bfb4ad9 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -46,7 +46,7 @@
 
 // Implements a floating toolbar for the debugger.
 
-// Unfortunately, I couldn't get the KToolBar to work nicely when it
+// Unfortunately, I couldn't get the TDEToolBar to work nicely when it
 // was floating, so I was forced to write these classes. I'm not sure whether
 // I didn't try hard enough or ... and I've forgotten what the problems were
 // now.
@@ -54,7 +54,7 @@
 // The problem with using this is that it will not dock as a normal toolbar.
 // I'm not convince that this is a real problem though.
 
-// So, if you can get it to work as a KToolBar, and it works well when the
+// So, if you can get it to work as a TDEToolBar, and it works well when the
 // app is running, then all these classes can be removed.
 
 // This code is very specific to the internal debugger in tdevelop.
@@ -70,7 +70,7 @@ namespace RDBDebugger
 // I would have preferred to use normal decoration on the toolbar and removed
 // the iconify, close, etc buttons from the window title but again I kept running
 // into problems. Instead, I used no decoration and this class. Also this looks
-// similar to the KToolBar floating style.
+// similar to the TDEToolBar floating style.
 class DbgMoveHandle : public TQFrame
 {
 public:
@@ -114,7 +114,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         return;
 
     if (e->button() == Qt::RightButton) {
-        KPopupMenu *menu = new KPopupMenu(this);
+        TDEPopupMenu *menu = new TDEPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
                          parent(), TQT_SLOT(slotDock()));
@@ -240,7 +240,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
         }
     case Qt::RightButton:
         {
-            KPopupMenu* menu = new KPopupMenu(this);
+            TDEPopupMenu* menu = new TDEPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
             menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
             menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 3daefeff..70611d28 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -156,10 +156,10 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
              this,             TQT_SLOT(slotGotoSource(const TQString&, int)) );
 
     // Now setup the actions
-    KAction *action;
+    TDEAction *action;
 
-//    action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
-    action = new KAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9,
+//    action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
+    action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9,
                          this, TQT_SLOT(slotRun()),
                          actionCollection(), "debug_run");
     action->setToolTip( i18n("Start in debugger") );
@@ -170,26 +170,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "while it is running, in order to get information "
                                "about variables, frame stack, and so on.") );
 
-    action = new KAction(i18n("Sto&p"), "stop", 0,
+    action = new TDEAction(i18n("Sto&p"), "stop", 0,
                          this, TQT_SLOT(slotStop()),
                          actionCollection(), "debug_stop");
     action->setToolTip( i18n("Stop debugger") );
     action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
 
-    action = new KAction(i18n("Interrupt"), "player_pause", 0,
+    action = new TDEAction(i18n("Interrupt"), "player_pause", 0,
                          this, TQT_SLOT(slotPause()),
                          actionCollection(), "debug_pause");
     action->setToolTip( i18n("Interrupt application") );
     action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command."));
 
-    action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0,
+    action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0,
                          this, TQT_SLOT(slotRunToCursor()),
                          actionCollection(), "debug_runtocursor");
     action->setToolTip( i18n("Run to cursor") );
     action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached."));
 
 
-    action = new KAction(i18n("Step &Over"), "dbgnext", 0,
+    action = new TDEAction(i18n("Step &Over"), "dbgnext", 0,
                          this, TQT_SLOT(slotStepOver()),
                          actionCollection(), "debug_stepover");
     action->setToolTip( i18n("Step over the next line") );
@@ -200,7 +200,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "following the method call.") );
 
 
-    action = new KAction(i18n("Step &Into"), "dbgstep", 0,
+    action = new TDEAction(i18n("Step &Into"), "dbgstep", 0,
                          this, TQT_SLOT(slotStepInto()),
                          actionCollection(), "debug_stepinto");
     action->setToolTip( i18n("Step into the next statement") );
@@ -211,7 +211,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
 
 
 
-    action = new KAction(i18n("Step O&ut"), "dbgstepout", 0,
+    action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0,
                          this, TQT_SLOT(slotStepOut()),
                          actionCollection(), "debug_stepout");
     action->setToolTip( i18n("Steps out of the current method") );
@@ -223,7 +223,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "the topleveltoggleWatchpoint) then this operation has no effect.") );
 
 
-    action = new KAction(i18n("Toggle Breakpoint"), 0, 0,
+    action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0,
                          this, TQT_SLOT(toggleBreakpoint()),
                          actionCollection(), "debug_toggle_breakpoint");
     action->setToolTip(i18n("Toggle breakpoint"));
@@ -488,7 +488,7 @@ bool RubyDebuggerPart::startDebugger()
 
     stateChanged( TQString("active") );
 
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     ac->action("debug_run")->setText( i18n("&Continue") );
 //    ac->action("debug_run")->setIcon( "dbgrun" );
     ac->action("debug_run")->setToolTip( i18n("Continues the application execution") );
@@ -566,7 +566,7 @@ void RubyDebuggerPart::slotStopDebugger()
     mainWindow()->setViewAvailable(framestackWidget, false);
     mainWindow()->setViewAvailable(rdbOutputWidget, false);
 
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     ac->action("debug_run")->setText( i18n("&Start") );
 //    ac->action("debug_run")->setIcon( "1rightarrow" );
     ac->action("debug_run")->setToolTip( i18n("Runs the program in the debugger") );
@@ -599,7 +599,7 @@ void RubyDebuggerPart::slotRun()
         appFrontend()->clearView();
         startDebugger();
     } else {
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("&Continue") );
         ac->action("debug_run")->setToolTip( i18n("Continues the application execution") );
         ac->action("debug_run")->setWhatsThis( i18n("Continue application execution\n\n"
@@ -701,7 +701,7 @@ void RubyDebuggerPart::slotStatus(const TQString &msg, int state)
     {
         stateIndicator = "E";
         stateChanged( TQString("stopped") );
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("Restart") );
 //        ac->action("debug_run")->setIcon( "1rightarrow" );
         ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") );
@@ -744,7 +744,7 @@ void RubyDebuggerPart::slotGotoSource(const TQString &fileName, int lineNum)
 
 void RubyDebuggerPart::slotActivePartChanged( KParts::Part* part )
 {
-    KAction* action = actionCollection()->action("debug_toggle_breakpoint");
+    TDEAction* action = actionCollection()->action("debug_toggle_breakpoint");
     if(!action)
         return;
 
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index de60eaea..8179eeab 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -128,7 +128,7 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el)
 // **************************************************************************
 
 VariableTree::VariableTree(VariableWidget *parent, const char *name)
-    : KListView(parent, name),
+    : TDEListView(parent, name),
       TQToolTip( viewport() ),
       activationId_(0),
       currentThread_(-1),
@@ -145,8 +145,8 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name)
     addColumn(i18n("Variable"), 100 );
     addColumn(i18n("Value"), 100 );
 
-    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-             TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+             TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) );
     
 	connect( this, TQT_SIGNAL(pressed(TQListViewItem*)),
              this, TQT_SLOT(slotPressed(TQListViewItem*)) );
@@ -180,7 +180,7 @@ void VariableTree::clear()
 
 // **************************************************************************
 
-void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
+void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item)
 {
     if (item == 0)
         return;
@@ -188,7 +188,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
     setSelected(item, true);    // Need to select this item.
 
     if (item->parent() != 0) {
-        KPopupMenu popup(this);
+        TDEPopupMenu popup(this);
         popup.insertTitle(item->text(VAR_NAME_COLUMN));
         int idRemoveWatch = -2;
         if (item->rtti() == RTTI_WATCH_VAR_ITEM) {
@@ -441,7 +441,7 @@ void VariableTree::maybeTip(const TQPoint &p)
 // **************************************************************************
 
 LazyFetchItem::LazyFetchItem(VariableTree *parent)
-    : KListViewItem(parent),
+    : TDEListViewItem(parent),
       activationId_(0),
 	  waitingForData_(false)
 {
@@ -451,7 +451,7 @@ LazyFetchItem::LazyFetchItem(VariableTree *parent)
 // **************************************************************************
 
 LazyFetchItem::LazyFetchItem(LazyFetchItem *parent)
-    : KListViewItem(parent),
+    : TDEListViewItem(parent),
       activationId_(0),
       waitingForData_(false)
 {
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index fa56aa6c..bac6d669 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -92,7 +92,7 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class VariableTree : public KListView, public TQToolTip
+class VariableTree : public TDEListView, public TQToolTip
 {
     Q_OBJECT
   
@@ -150,7 +150,7 @@ public slots:
     void slotPressed(TQListViewItem * item);	
 
 private slots:
-    void slotContextMenu(KListView *, TQListViewItem *item);
+    void slotContextMenu(TDEListView *, TQListViewItem *item);
 
 private:
     int activationId_;
@@ -169,7 +169,7 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class LazyFetchItem : public KListViewItem
+class LazyFetchItem : public TDEListViewItem
 {
 public:
     LazyFetchItem(VariableTree *parent);
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 7111ffca..0a963043 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -47,28 +47,28 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr
   setInstance(RubySupportFactory::instance());
   setXMLFile("kdevrubysupport.rc");
 
-  KAction *action;
-  action = new KAction( i18n("&Run"), "exec", SHIFT + Key_F9,
+  TDEAction *action;
+  action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9,
                         this, TQT_SLOT(slotRun()),
                         actionCollection(), "build_execute" );
   action->setToolTip(i18n("Run"));
   action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
   action->setIcon("ruby_run.png");
 
-  action = new KAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9,
+  action = new TDEAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9,
                         this, TQT_SLOT(slotRunTestUnderCursor()),
                         actionCollection(), "build_execute_test_function" );
   action->setToolTip(i18n("Run Test Under Cursor"));
   action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test."));
 
-  action = new KAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" );
+  action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" );
   action->setToolTip(i18n("Launch Browser"));
   action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") );
 
-  action = new KAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" );
-  action = new KAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" );
-  action = new KAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" );
-  action = new KAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" );
+  action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" );
+  action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" );
+  action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" );
+  action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" );
 
   kdDebug() << "Creating RubySupportPart" << endl;