Rename a number of classes to enhance compatibility with KDE4

2 files changed, 19 insertions, 19 deletions

diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index ec794b8d2..ac78526ae 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
 }
 //-------------------------------------------------------------------------
 KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
-  : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
+  : TDEMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
 {
   m_breakpoints = 0;
   m_breakpointCount = 0;
@@ -436,27 +436,27 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   vl->addWidget(hsplitter);
 
   // actions
-  KPopupMenu *debugMenu = new KPopupMenu(this);
+  TDEPopupMenu *debugMenu = new TDEPopupMenu(this);
   menuBar()->insertItem("&Debug",debugMenu);
 
-  m_actionCollection = new KActionCollection(this);
+  m_actionCollection = new TDEActionCollection(this);
   m_actionCollection->setInstance(this);
 
   // Venkman use F12, KDevelop F10
-  KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12)));
+  TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
   scNext.append(KKeySequence(KKey(Qt::Key_F10)));
-  m_nextAction       = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
 				   m_actionCollection,"next");
-  m_stepAction       = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
 				   m_actionCollection,"step");
   // Venkman use F5, Kdevelop F9
-  KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5)));
+  TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
   scCont.append(KKeySequence(KKey(Qt::Key_F9)));
-  m_continueAction   = new KAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
 				   m_actionCollection,"cont");
-  m_stopAction       = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+  m_stopAction       = new TDEAction(i18n("St&op"),"stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
 				   m_actionCollection,"stop");
-  m_breakAction      = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
 				   m_actionCollection,"breaknext");
 
 
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index dc2368ac2..af205d654 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -43,8 +43,8 @@
 
 class TQListBox;
 class TQComboBox;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 
 namespace KJS {
   class FunctionImp;
@@ -157,7 +157,7 @@ namespace KJS {
    *
    * There is only one debug window per program. This can be obtained by calling #instance
    */
-  class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
+  class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
   {
     Q_OBJECT
     friend class SourceDisplay;
@@ -259,17 +259,17 @@ namespace KJS {
     TQMap<int,SourceFragment*> m_sourceFragments; /* maps SourceId->SourceFragment */
     TQPtrList<SourceFile> m_sourceSelFiles; /* maps combobox index->SourceFile */
 
-    KActionCollection *m_actionCollection;
+    TDEActionCollection *m_actionCollection;
     TQPixmap m_stopIcon;
     TQPixmap m_emptyIcon;
     SourceDisplay *m_sourceDisplay;
     TQListBox *m_contextList;
 
-    KAction *m_stepAction;
-    KAction *m_nextAction;
-    KAction *m_continueAction;
-    KAction *m_stopAction;
-    KAction *m_breakAction;
+    TDEAction *m_stepAction;
+    TDEAction *m_nextAction;
+    TDEAction *m_continueAction;
+    TDEAction *m_stopAction;
+    TDEAction *m_breakAction;
 
     TQComboBox *m_sourceSel;
     EvalMultiLineEdit *m_evalEdit;