From 32b67ac0690de411b26b1d5e715b188c27442248 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/cpp/debugger/dbgpsdlg.cpp | 4 +- languages/cpp/debugger/dbgpsdlg.h | 2 +- languages/cpp/debugger/dbgtoolbar.cpp | 28 ++++---- languages/cpp/debugger/dbgtoolbar.h | 4 +- languages/cpp/debugger/debuggerconfigwidget.cpp | 4 +- languages/cpp/debugger/debuggerconfigwidget.h | 2 +- languages/cpp/debugger/debuggerpart.cpp | 4 +- languages/cpp/debugger/debuggerpart.h | 2 +- languages/cpp/debugger/debuggertracingdialog.cpp | 4 +- languages/cpp/debugger/debuggertracingdialog.h | 2 +- languages/cpp/debugger/disassemblewidget.cpp | 4 +- languages/cpp/debugger/disassemblewidget.h | 2 +- languages/cpp/debugger/framestackwidget.cpp | 18 ++--- languages/cpp/debugger/framestackwidget.h | 8 +-- languages/cpp/debugger/gdbbreakpointwidget.cpp | 10 +-- languages/cpp/debugger/gdbbreakpointwidget.h | 2 +- languages/cpp/debugger/gdboutputwidget.cpp | 4 +- languages/cpp/debugger/gdboutputwidget.h | 8 +-- languages/cpp/debugger/gdbparser.h | 2 +- languages/cpp/debugger/gdbtable.cpp | 8 +-- languages/cpp/debugger/gdbtable.h | 4 +- languages/cpp/debugger/label_with_double_click.cpp | 4 +- languages/cpp/debugger/label_with_double_click.h | 2 +- languages/cpp/debugger/memviewdlg.cpp | 12 ++-- languages/cpp/debugger/memviewdlg.h | 4 +- languages/cpp/debugger/stty.cpp | 4 +- languages/cpp/debugger/variablewidget.cpp | 78 +++++++++++----------- languages/cpp/debugger/variablewidget.h | 18 ++--- 28 files changed, 124 insertions(+), 124 deletions(-) (limited to 'languages/cpp/debugger') diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index fe04ffd4..64f4dcee 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -50,8 +50,8 @@ namespace GDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name) - : KDialog(tqparent, name, true), // modal +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) + : KDialog(parent, name, true), // modal psProc_(0), pids_(new KListView(this)), pidLines_(TQString()) diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 273bb7b8..82e73606 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -34,7 +34,7 @@ class Dbg_PS_Dialog : public KDialog TQ_OBJECT public: - Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 58cea851..9a3f4e02 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -68,7 +68,7 @@ namespace GDBDebugger class DbgMoveHandle : public TQFrame { public: - DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0); + DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); virtual void mousePressEvent(TQMouseEvent *e); @@ -83,9 +83,9 @@ private: // ************************************************************************** -DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f) - : TQFrame(tqparent, name, f), - toolBar_(tqparent), +DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) + : TQFrame(parent, name, f), + toolBar_(parent), offset_(TQPoint(0,0)), moving_(false) { @@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - tqparent(), TQT_SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - tqparent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -159,7 +159,7 @@ class DbgButton : public TQPushButton { public: DbgButton(const TQPixmap &pixmap, const TQString &text, - DbgToolBar *tqparent, const char *name=0); + DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); TQSize tqsizeHint() const; @@ -171,8 +171,8 @@ private: // ************************************************************************** DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, - DbgToolBar* tqparent, const char* name) - : TQPushButton(tqparent, name), + DbgToolBar* parent, const char* name) + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -217,8 +217,8 @@ TQSize DbgButton::tqsizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) : - KSystemTray(tqparent, "DbgDocker"), +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : + KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); @@ -258,7 +258,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - TQWidget* tqparent, const char* name) + TQWidget* parent, const char* name) : TQFrame(0, name), part_(part), activeWindow_(0), @@ -268,10 +268,10 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, appIsActive_(false), docked_(false), docker_(0), - dockWindow_(new KSystemTray(tqparent)) + dockWindow_(new KSystemTray(parent)) { winModule_ = new KWinModule(TQT_TQOBJECT(this)); - docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext")); + docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 427120d9..a163af0c 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -36,7 +36,7 @@ class DbgDocker : public KSystemTray TQ_OBJECT public: - DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; virtual void mousePressEvent(TQMouseEvent *e); @@ -54,7 +54,7 @@ class DbgToolBar : public TQFrame TQ_OBJECT public: - DbgToolBar(DebuggerPart *part, TQWidget* tqparent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index 2fbc6a88..409329f7 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -27,8 +27,8 @@ namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *tqparent, const char *name) - : DebuggerConfigWidgetBase(tqparent, name), dom(*part->projectDom()) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) + : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index cdd2479d..d17d1202 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -29,7 +29,7 @@ class DebuggerConfigWidget : public DebuggerConfigWidgetBase TQ_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, TQWidget *tqparent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 43d6990e..b74b9d63 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) : - KDevPlugin( &data, tqparent, name ? name : "DebuggerPart" ), +DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : + KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index 71d56568..6981265f 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -50,7 +50,7 @@ class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface TQ_OBJECT public: - DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ); + DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~DebuggerPart(); virtual void restorePartialProjectSession(const TQDomElement* el); virtual void savePartialProjectSession(TQDomElement* el); diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 0af77613..6bf70f3b 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -14,8 +14,8 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name) - : DebuggerTracingDialogBase(tqparent, name), bp_(bp) + TQWidget* parent, const char* name) + : DebuggerTracingDialogBase(parent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index e0e8dc48..4cbffe36 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -26,7 +26,7 @@ namespace GDBDebugger TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 6b848a27..562aa1ae 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *tqparent, const char *name) - : TQTextEdit(tqparent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) + : TQTextEdit(parent, name), controller_(controller), active_(false), lower_(0), upper_(0), diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 33f29da9..18dc3a7a 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -36,7 +36,7 @@ class DisassembleWidget : public TQTextEdit TQ_OBJECT public: - DisassembleWidget( GDBController* controller, TQWidget *tqparent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 28fd076e..639ab74b 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - TQWidget *tqparent, + TQWidget *parent, const char *name, WFlags f) - : TQListView(tqparent, name, f), + : TQListView(parent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -493,10 +493,10 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, // ************************************************************************** // ************************************************************************** -FrameStackItem::FrameStackItem(FramestackWidget *tqparent, +FrameStackItem::FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -505,12 +505,12 @@ FrameStackItem::FrameStackItem(FramestackWidget *tqparent, // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, +FrameStackItem::FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), - threadNo_(tqparent->threadNo()) + threadNo_(parent->threadNo()) { setText(0, name); } @@ -554,8 +554,8 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo) -: TQListViewItem(tqparent), +ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) +: TQListViewItem(parent), threadNo_(threadNo) { setText(0, i18n("Thread %1").tqarg(threadNo_)); diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 5d0b98e7..631c440f 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -33,7 +33,7 @@ class FramestackWidget; class ThreadStackItem : public TQListViewItem { public: - ThreadStackItem(FramestackWidget *tqparent, + ThreadStackItem(FramestackWidget *parent, unsigned threadNo); virtual ~ThreadStackItem(); @@ -59,10 +59,10 @@ private: class FrameStackItem : public TQListViewItem { public: - FrameStackItem(FramestackWidget *tqparent, + FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name); - FrameStackItem(ThreadStackItem *tqparent, + FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name); virtual ~FrameStackItem(); @@ -95,7 +95,7 @@ class FramestackWidget : public TQListView public: FramestackWidget( GDBController* controller, - TQWidget *tqparent=0, + TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index dffdf5d4..10d8a749 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - TQTableItem(tqparent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -146,7 +146,7 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->tqparent(), TQT_SLOT(editTracing(TQTableItem*))); + table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -196,8 +196,8 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - TQWidget *tqparent, const char *name) : -TQHBox(tqparent, name), + TQWidget *parent, const char *name) : +TQHBox(parent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index 2379a318..c1a0c7fe 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -48,7 +48,7 @@ class GDBBreakpointWidget : public TQHBox public: GDBBreakpointWidget( GDBController* controller, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index fe5059cb..7648fdf2 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index 171fdb86..ed841d9b 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -38,7 +38,7 @@ class GDBOutputWidget : public TQWidget TQ_OBJECT public: - GDBOutputWidget( TQWidget *tqparent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~GDBOutputWidget(); void savePartialProjectSession(TQDomElement* el); @@ -119,9 +119,9 @@ class OutputText : public TQTextEdit Q_OBJECT TQ_OBJECT public: - OutputText(GDBOutputWidget* tqparent) - : TQTextEdit(tqparent), - parent_(tqparent) + OutputText(GDBOutputWidget* parent) + : TQTextEdit(parent), + parent_(parent) {} TQPopupMenu* createPopupMenu(const TQPoint& pos); diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index 08e5cda7..a56c082d 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -35,7 +35,7 @@ public: static void destroy(); private: - void parseArray(TrimmableItem *tqparent, const char *buf); + void parseArray(TrimmableItem *parent, const char *buf); const char *skipTokenEnd(const char *buf) const; const char *skipTokenValue(const char *buf) const; diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c4b16da8..c9c1bf2f 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +GDBTable::GDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -GDBTable::GDBTable(int nr, int nc, TQWidget * tqparent, const char * name) - : TQTable(nr, nc, tqparent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 55374380..da1e7a0e 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -19,8 +19,8 @@ class GDBTable : public TQTable Q_OBJECT TQ_OBJECT public: - GDBTable(TQWidget *tqparent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 ); + GDBTable(TQWidget *parent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~GDBTable(); virtual void keyPressEvent ( TQKeyEvent * e ); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index deaab3cc..f08c7358 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,8 +1,8 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* tqparent) -: TQLabel(s, tqparent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) +: TQLabel(s, parent) {} void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 616ad903..ebff3d92 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -9,7 +9,7 @@ class LabelWithDoubleClick : public TQLabel Q_OBJECT TQ_OBJECT public: - LabelWithDoubleClick(const TQString& s, TQWidget* tqparent); + LabelWithDoubleClick(const TQString& s, TQWidget* parent); signals: void doubleClicked(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index c594d134..48c2ddd4 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -79,8 +79,8 @@ namespace GDBDebugger TQPushButton* okButton; TQPushButton* cancelButton; - MemoryRangeSelector(TQWidget* tqparent) - : TQWidget(tqparent) + MemoryRangeSelector(TQWidget* parent) + : TQWidget(parent) { TQVBoxLayout* l = new TQVBoxLayout(this); @@ -127,8 +127,8 @@ namespace GDBDebugger MemoryView::MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), + TQWidget* parent, const char* name) + : TQWidget(parent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -403,9 +403,9 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - TQWidget* tqparent, + TQWidget* parent, const char* name) - : TQWidget(tqparent, name), + : TQWidget(parent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index 991efbb3..ecdb304f 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -37,7 +37,7 @@ namespace GDBDebugger TQ_OBJECT public: ViewerWidget(GDBController* controller, - TQWidget* tqparent, const char* name); + TQWidget* parent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -68,7 +68,7 @@ namespace GDBDebugger TQ_OBJECT public: MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); void debuggerStateChanged(int state); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 07b848d9..52ff7a24 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -346,11 +346,11 @@ bool STTY::findExternalTTY(const TQString &termApp) ::exit(1); } - // tqparent process + // parent process if (pid <= 0) ::exit(1); - // Open the communication between us (the tqparent) and the + // Open the communication between us (the parent) and the // child (the process running on a tty console) fifo_fd = ::open(fifo, O_RDONLY); if (fifo_fd < 0) diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 2b9e4de3..581b3cb8 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) + TQWidget *parent, const char *name) +: TQWidget(parent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -197,11 +197,11 @@ void VariableWidget::focusInEvent(TQFocusEvent */*e*/) // ************************************************************************** // ************************************************************************** -VariableTree::VariableTree(VariableWidget *tqparent, +VariableTree::VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(tqparent, name), + : KListView(parent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -244,7 +244,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. - if (item->tqparent()) + if (item->parent()) { KPopupMenu popup(this); KPopupMenu format(this); @@ -360,7 +360,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotEvaluateExpression(item->gdbExpression()); } } @@ -368,7 +368,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotAddWatchVariable(item->gdbExpression()); } } @@ -547,8 +547,8 @@ void VariableTree::slotEvaluateExpression(const TQString &expression) TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { - while (item->tqparent()) - item = item->tqparent(); + while (item->parent()) + item = item->parent(); return item; } @@ -1018,15 +1018,15 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** // ************************************************************************** -TrimmableItem::TrimmableItem(VariableTree *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(VariableTree *parent) + : KListViewItem (parent, parent->lastChild()) { } // ************************************************************************** -TrimmableItem::TrimmableItem(TrimmableItem *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(TrimmableItem *parent) + : KListViewItem (parent, parent->lastChild()) { } @@ -1044,7 +1044,7 @@ void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, if ( !p ) return; // make toplevel item (watch and frame items) names bold - if (column == 0 && !tqparent()) + if (column == 0 && !parent()) { TQFont f = p->font(); f.setBold(true); @@ -1069,10 +1069,10 @@ TQListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; -VarItem::VarItem(TrimmableItem *tqparent, +VarItem::VarItem(TrimmableItem *parent, const TQString& expression, bool frozen) - : TrimmableItem (tqparent), + : TrimmableItem (parent), expression_(expression), highlight_(false), oldSpecialRepresentationSet_(false), @@ -1116,9 +1116,9 @@ VarItem::VarItem(TrimmableItem *tqparent, createVarobj(); } -VarItem::VarItem(TrimmableItem *tqparent, const GDBMI::Value& varobj, +VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember) -: TrimmableItem (tqparent), +: TrimmableItem (parent), highlight_(false), oldSpecialRepresentationSet_(false), format_(format), @@ -1394,7 +1394,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, { kdDebug(9012) << "Creating new varobj " << exp << " " << baseObject << "\n"; - // Propagate format from tqparent. + // Propagate format from parent. VarItem* v = 0; v = new VarItem(this, tqchildren[i], format_, baseObject); } @@ -1469,10 +1469,10 @@ TQString VarItem::displayName() const if (expression_[0] != '*') return expression_; - if (const VarItem* tqparent = - dynamic_cast(TrimmableItem::tqparent())) + if (const VarItem* parent = + dynamic_cast(TrimmableItem::parent())) { - return "*" + tqparent->displayName(); + return "*" + parent->displayName(); } else { @@ -1504,24 +1504,24 @@ TQString VarItem::gdbExpression() const // - number, for array element // - identifier, for member, // - ***intentifier, for derefenreced pointer. - const VarItem* tqparent = dynamic_cast(TrimmableItem::tqparent()); + const VarItem* parent = dynamic_cast(TrimmableItem::parent()); bool ok = false; expression_.toInt(&ok); if (ok) { - // Array, tqparent always exists. - return tqparent->gdbExpression() + "[" + expression_ + "]"; + // Array, parent always exists. + return parent->gdbExpression() + "[" + expression_ + "]"; } else if (expression_[0] == '*') { - if (tqparent) + if (parent) { // For MI, expression_ can be "*0" (meaing // references 0-th element of some array). - // So, we really need to get to the tqparent to computed the right + // So, we really need to get to the parent to computed the right // gdb expression. - return "*" + tqparent->gdbExpression(); + return "*" + parent->gdbExpression(); } else { @@ -1532,14 +1532,14 @@ TQString VarItem::gdbExpression() const } else { - if (tqparent) + if (parent) /* This is varitem corresponds to a base suboject, - the expression should cast tqparent to the base's + the expression should cast parent to the base's type. */ if (baseClassMember_) - return "((" + expression_ + ")" + tqparent->gdbExpression() + ")"; + return "((" + expression_ + ")" + parent->gdbExpression() + ")"; else - return tqparent->gdbExpression() + "." + expression_; + return parent->gdbExpression() + "." + expression_; else return expression_; } @@ -1877,7 +1877,7 @@ VariableTree* VarItem::varTree() const void VarItem::unhookFromGdb() { // Unhook tqchildren first, so that child varitems are deleted - // before tqparent. Strictly speaking, we can avoid calling + // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) @@ -1931,8 +1931,8 @@ bool VarItem::isAlive() const // ************************************************************************** // ************************************************************************** -VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo) - : TrimmableItem (tqparent), +VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo) + : TrimmableItem (parent), needLocals_(false), frameNo_(frameNo), threadNo_(threadNo), @@ -1956,8 +1956,8 @@ void VarFrameRoot::setOpen(bool open) if (frameOpened && needLocals_) { needLocals_ = false; - VariableTree* tqparent = static_cast(listView()); - tqparent->updateCurrentFrame(); + VariableTree* parent = static_cast(listView()); + parent->updateCurrentFrame(); } } @@ -1978,8 +1978,8 @@ void VarFrameRoot::setDirty() // ************************************************************************** // ************************************************************************** -WatchRoot::WatchRoot(VariableTree *tqparent) - : TrimmableItem(tqparent) +WatchRoot::WatchRoot(VariableTree *parent) + : TrimmableItem(parent) { setText(0, i18n("Watch")); setOpen(true); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index d56e8977..2e5e6c38 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -57,7 +57,7 @@ class VariableWidget : public TQWidget public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } @@ -88,7 +88,7 @@ class VariableTree : public KListView, public TQToolTip Q_OBJECT TQ_OBJECT public: - VariableTree(VariableWidget *tqparent, + VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name=0 ); @@ -207,8 +207,8 @@ private: class TrimmableItem : public KListViewItem { public: - TrimmableItem(VariableTree *tqparent); - TrimmableItem(TrimmableItem *tqparent); + TrimmableItem(VariableTree *parent); + TrimmableItem(TrimmableItem *parent); virtual ~TrimmableItem(); @@ -235,11 +235,11 @@ public: /** Creates top-level variable item from the specified expression. Optionally, alternative display name can be provided. */ - VarItem( TrimmableItem *tqparent, + VarItem( TrimmableItem *parent, const TQString& expression, bool frozen = false); - VarItem( TrimmableItem *tqparent, const GDBMI::Value& varobj, + VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember); virtual ~VarItem(); @@ -373,7 +373,7 @@ private: private: // The gdb expression for this varItem relatively to - // tqparent VarItem. + // parent VarItem. TQString expression_; bool highlight_; @@ -418,7 +418,7 @@ private: class VarFrameRoot : public TrimmableItem { public: - VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo); + VarFrameRoot(VariableTree *parent, int frameNo, int threadNo); virtual ~VarFrameRoot(); void setOpen(bool open); @@ -456,7 +456,7 @@ private: class WatchRoot : public TrimmableItem { public: - WatchRoot(VariableTree *tqparent); + WatchRoot(VariableTree *parent); virtual ~WatchRoot(); }; -- cgit v1.2.1