diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:15:35 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:15:35 -0600 |
commit | f78eb03afb8c9a380985d26286afc40b4c89b292 (patch) | |
tree | 3c087e2f119e645c902958c3bc3c802abf078ad0 /languages/cpp/debugger | |
parent | da1941ccadffe5ae70ee111c53f0ec2b3d990869 (diff) | |
download | tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.tar.gz tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'languages/cpp/debugger')
-rw-r--r-- | languages/cpp/debugger/dbgpsdlg.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/debugger/dbgpsdlg.h | 8 | ||||
-rw-r--r-- | languages/cpp/debugger/dbgtoolbar.cpp | 10 | ||||
-rw-r--r-- | languages/cpp/debugger/debuggerpart.cpp | 46 | ||||
-rw-r--r-- | languages/cpp/debugger/gdboutputwidget.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/variablewidget.cpp | 18 | ||||
-rw-r--r-- | languages/cpp/debugger/variablewidget.h | 10 |
7 files changed, 50 insertions, 50 deletions
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 8033a993..22104794 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -53,7 +53,7 @@ namespace GDBDebugger Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) : KDialog(parent, name, true), // modal psProc_(0), - pids_(new KListView(this)), + pids_(new TDEListView(this)), pidLines_(TQString()) { setCaption(i18n("Attach to Process")); @@ -67,7 +67,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); - searchLineWidget_ = new KListViewSearchLineWidget(pids_, this); + searchLineWidget_ = new TDEListViewSearchLineWidget(pids_, this); topLayout->addWidget(searchLineWidget_); topLayout->addWidget(pids_); @@ -187,7 +187,7 @@ void Dbg_PS_Dialog::slotProcessExited() start = pos+1; } - // Need to set focus here too, as KListView will + // Need to set focus here too, as TDEListView will // 'steal' it otherwise. searchLineWidget_->searchLine()->setFocus(); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 0bf445dc..f9dbbab0 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -20,8 +20,8 @@ class TQListBox; class TDEProcess; -class KListView; -class KListViewSearchLineWidget; +class TDEListView; +class TDEListViewSearchLineWidget; namespace GDBDebugger { @@ -49,8 +49,8 @@ protected: private: TDEProcess* psProc_; - KListView* pids_; - KListViewSearchLineWidget* searchLineWidget_; + TDEListView* pids_; + TDEListViewSearchLineWidget* searchLineWidget_; TQString pidLines_; TQString pidCmd_; }; diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 8933ea12..16fe3b53 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -40,7 +40,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. @@ -48,7 +48,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. @@ -64,7 +64,7 @@ namespace GDBDebugger // 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: @@ -108,7 +108,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())); @@ -241,7 +241,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/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index c18d581d..29280d4e 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -183,10 +183,10 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi this, TQT_SLOT(slotShowView(bool))); // Now setup the actions - KAction *action; + TDEAction *action; -// action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, - action = new KAction(i18n("&Start"), "dbgrun", Key_F9, +// action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, + action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); @@ -197,7 +197,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - action = new KAction(i18n("&Restart"), "dbgrestart", 0, + action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, this, TQT_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); @@ -207,33 +207,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action->setEnabled(false); - 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 GDB 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("Set E&xecution Position to Cursor"), "dbgjumpto", 0, + action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, this, TQT_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); - action = new KAction(i18n("Step &Over"), "dbgnext", Key_F10, + action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); @@ -244,14 +244,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "following the function call.") ); - action = new KAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, + action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, this, TQT_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); - action = new KAction(i18n("Step &Into"), "dbgstep", Key_F11, + action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); @@ -261,14 +261,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "the function has been entered.") ); - action = new KAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, + action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, this, TQT_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); - action = new KAction(i18n("Step O&ut"), "dbgstepout", Key_F12, + action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); @@ -280,7 +280,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "main()) then this operation has no effect.") ); - action = new KAction(i18n("Viewers"), "dbgmemview", 0, + action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, this, TQT_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); @@ -291,7 +291,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "<b>Libraries</b>")); - action = new KAction(i18n("Examine Core File..."), "core", 0, + action = new TDEAction(i18n("Examine Core File..."), "core", 0, this, TQT_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); @@ -303,13 +303,13 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "allowing you to do a post-mortem analysis.") ); - action = new KAction(i18n("Attach to Process"), "connect_creating", 0, + action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, this, TQT_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); - 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")); @@ -492,7 +492,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (running) { // Too bad we can't add TQAction to popup menu in TQt3. - KAction* act = actionCollection()->action("debug_runtocursor"); + TDEAction* act = actionCollection()->action("debug_runtocursor"); Q_ASSERT(act); if (act) { @@ -672,7 +672,7 @@ bool DebuggerPart::startDebugger() stateChanged( TQString("active") ); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); ac->action("debug_run")->setToolTip( @@ -737,7 +737,7 @@ void DebuggerPart::slotStopDebugger() mainWindow()->setViewAvailable(disassembleWidget, false); mainWindow()->setViewAvailable(gdbOutputWidget, 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") ); @@ -912,7 +912,7 @@ void DebuggerPart::slotRun_part2() } else if (controller->stateIsOn( s_appNotStarted ) ) { - 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" @@ -1135,7 +1135,7 @@ void DebuggerPart::slotStatus(const TQString &msg, int state) if (state & s_appNotStarted) { - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("To start something","Start") ); ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") ); ac->action("debug_run")->setWhatsThis( i18n("Restart in debugger\n\n" @@ -1215,7 +1215,7 @@ void DebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) void DebuggerPart::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/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 11e50feb..ef2dd56f 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -321,7 +321,7 @@ void GDBOutputWidget::restorePartialProjectSession(const TQDomElement* el) //void OutputText::contextMenuEvent(TQContextMenuEvent* e) TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) { - KPopupMenu* popup = new KPopupMenu; + TDEPopupMenu* popup = new TDEPopupMenu; int id = popup->insertItem(i18n("Show Internal Commands"), this, diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 62a99ad4..19dd877a 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -201,7 +201,7 @@ VariableTree::VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -223,8 +223,8 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - 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(itemRenamed( TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } @@ -237,7 +237,7 @@ VariableTree::~VariableTree() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) +void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) { if (!item) return; @@ -246,8 +246,8 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) if (item->parent()) { - KPopupMenu popup(this); - KPopupMenu format(this); + TDEPopupMenu popup(this); + TDEPopupMenu format(this); int idRemember = -2; int idRemove = -2; @@ -393,7 +393,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) } else if (item == recentExpressions_) { - KPopupMenu popup(this); + TDEPopupMenu popup(this); popup.insertTitle(i18n("Recent Expressions")); int idRemove = popup.insertItem( SmallIcon("editdelete"), i18n("Remove All")); @@ -1019,14 +1019,14 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** TrimmableItem::TrimmableItem(VariableTree *parent) - : KListViewItem (parent, parent->lastChild()) + : TDEListViewItem (parent, parent->lastChild()) { } // ************************************************************************** TrimmableItem::TrimmableItem(TrimmableItem *parent) - : KListViewItem (parent, parent->lastChild()) + : TDEListViewItem (parent, parent->lastChild()) { } diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index 86d08848..d08d5729 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -31,7 +31,7 @@ #include <vector> class KLineEdit; -class KPopupMenu; +class TDEPopupMenu; namespace GDBDebugger { @@ -83,7 +83,7 @@ private: /***************************************************************************/ /***************************************************************************/ -class VariableTree : public KListView, public TQToolTip +class VariableTree : public TDEListView, public TQToolTip { Q_OBJECT @@ -117,7 +117,7 @@ public slots: void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); private slots: - void slotContextMenu(KListView *, TQListViewItem *item); + void slotContextMenu(TDEListView *, TQListViewItem *item); void slotVarobjNameChanged(const TQString& from, const TQString& to); private: // Callbacks for gdb commands; @@ -174,7 +174,7 @@ private: TQMap<TQString, VarItem*> varobj2varitem; - KPopupMenu* activePopup_; + TDEPopupMenu* activePopup_; static const int idToggleWatch = 10; friend class VarFrameRoot; @@ -204,7 +204,7 @@ private: 'trim' method is called, removing all variables which were not recieved from gdbr. */ -class TrimmableItem : public KListViewItem +class TrimmableItem : public TDEListViewItem { public: TrimmableItem(VariableTree *parent); |