From e47aaa9b34ffc363d268aca989aab28fdfaf9821 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/applications/ktechlab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/colorcombo.cpp | 4 ++-- src/gui/colorcombo.h | 2 +- src/gui/contexthelp.cpp | 10 ++++---- src/gui/contexthelp.h | 4 ++-- src/gui/doublespinbox.cpp | 4 ++-- src/gui/doublespinbox.h | 2 +- src/gui/itemeditor.cpp | 10 ++++---- src/gui/itemeditor.h | 4 ++-- src/gui/itemselector.cpp | 52 +++++++++++++++++++++--------------------- src/gui/itemselector.h | 20 ++++++++-------- src/gui/logview.cpp | 4 ++-- src/gui/logview.h | 2 +- src/gui/microselectwidget.cpp | 4 ++-- src/gui/microselectwidget.h | 2 +- src/gui/microsettingsdlg.cpp | 4 ++-- src/gui/microsettingsdlg.h | 2 +- src/gui/newfiledlg.cpp | 6 ++--- src/gui/newfiledlg.h | 2 +- src/gui/orientationwidget.cpp | 4 ++-- src/gui/orientationwidget.h | 2 +- src/gui/oscilloscope.cpp | 10 ++++---- src/gui/oscilloscope.h | 4 ++-- src/gui/oscilloscopeview.cpp | 4 ++-- src/gui/oscilloscopeview.h | 2 +- src/gui/outputmethoddlg.cpp | 4 ++-- src/gui/outputmethoddlg.h | 2 +- src/gui/pieditor.cpp | 32 +++++++++++++------------- src/gui/pieditor.h | 16 ++++++------- src/gui/probepositioner.cpp | 4 ++-- src/gui/probepositioner.h | 2 +- src/gui/programmerdlg.cpp | 4 ++-- src/gui/programmerdlg.h | 2 +- src/gui/projectdlgs.cpp | 16 ++++++------- src/gui/projectdlgs.h | 8 +++---- src/gui/propertieslistview.cpp | 4 ++-- src/gui/propertieslistview.h | 2 +- src/gui/settingsdlg.cpp | 4 ++-- src/gui/settingsdlg.h | 2 +- src/gui/symbolviewer.cpp | 10 ++++---- src/gui/symbolviewer.h | 4 ++-- 40 files changed, 140 insertions(+), 140 deletions(-) (limited to 'src/gui') diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp index 786ef98..55b8958 100644 --- a/src/gui/colorcombo.cpp +++ b/src/gui/colorcombo.cpp @@ -18,8 +18,8 @@ bool ColorCombo::createdPalettes = false; TQColor * ColorCombo::palette[ NumberOfSchemes ]; int ColorCombo::paletteSize[ NumberOfSchemes ]; -ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { m_colorScheme = colorScheme; diff --git a/src/gui/colorcombo.h b/src/gui/colorcombo.h index 0fb6071..65af079 100644 --- a/src/gui/colorcombo.h +++ b/src/gui/colorcombo.h @@ -37,7 +37,7 @@ class ColorCombo : public TQComboBox /** * Constructs a color combo box. */ - ColorCombo( ColorScheme colorScheme, TQWidget *tqparent, const char *name = 0L ); + ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *name = 0L ); ~ColorCombo(); /** diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp index e10c30d..f7a2432 100644 --- a/src/gui/contexthelp.cpp +++ b/src/gui/contexthelp.cpp @@ -26,19 +26,19 @@ ContextHelp * ContextHelp::m_pSelf = 0l; -ContextHelp * ContextHelp::self( KateMDI::ToolView * tqparent ) +ContextHelp * ContextHelp::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ContextHelp(tqparent); + assert(parent); + m_pSelf = new ContextHelp(parent); } return m_pSelf; } -ContextHelp::ContextHelp( KateMDI::ToolView * tqparent ) - : TQWidget( tqparent, "Context Help" ) +ContextHelp::ContextHelp( KateMDI::ToolView * parent ) + : TQWidget( parent, "Context Help" ) { TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") ); diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h index c363e39..428ac1b 100644 --- a/src/gui/contexthelp.h +++ b/src/gui/contexthelp.h @@ -32,7 +32,7 @@ class ContextHelp : public TQWidget Q_OBJECT TQ_OBJECT public: - static ContextHelp * self( KateMDI::ToolView * tqparent = 0l ); + static ContextHelp * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "ContextHelp"; } ~ContextHelp(); @@ -48,7 +48,7 @@ class ContextHelp : public TQWidget void setContextHelp(const TQString& name, const TQString &help); private: - ContextHelp( KateMDI::ToolView * tqparent ); + ContextHelp( KateMDI::ToolView * parent ); TQLabel *m_nameLbl; TQTextBrowser *m_info; diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp index 6a384ed..b994c23 100644 --- a/src/gui/doublespinbox.cpp +++ b/src/gui/doublespinbox.cpp @@ -30,8 +30,8 @@ inline int roundDouble( double val ) } -DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString &unit, TQWidget * tqparent ) - : TQSpinBox( tqparent ) +DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString &unit, TQWidget * parent ) + : TQSpinBox( parent ) { m_lastEmittedValue = value; m_unit = unit; diff --git a/src/gui/doublespinbox.h b/src/gui/doublespinbox.h index 6df8f76..9a412fb 100644 --- a/src/gui/doublespinbox.h +++ b/src/gui/doublespinbox.h @@ -25,7 +25,7 @@ class DoubleSpinBox : public TQSpinBox Q_OBJECT TQ_OBJECT public: - DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * tqparent = 0 ); + DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * parent = 0 ); virtual ~DoubleSpinBox(); /** diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp index 3e8a30e..58b0661 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -26,19 +26,19 @@ ItemEditor * ItemEditor::m_pSelf = 0l; -ItemEditor * ItemEditor::self( KateMDI::ToolView * tqparent ) +ItemEditor * ItemEditor::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ItemEditor(tqparent); + assert(parent); + m_pSelf = new ItemEditor(parent); } return m_pSelf; } -ItemEditor::ItemEditor( KateMDI::ToolView * tqparent ) - : TQWidget( (TQWidget*)tqparent, "Item Editor" ) +ItemEditor::ItemEditor( KateMDI::ToolView * parent ) + : TQWidget( (TQWidget*)parent, "Item Editor" ) { TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") ); diff --git a/src/gui/itemeditor.h b/src/gui/itemeditor.h index 38ed260..506e7c0 100644 --- a/src/gui/itemeditor.h +++ b/src/gui/itemeditor.h @@ -38,7 +38,7 @@ class ItemEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - static ItemEditor * self( KateMDI::ToolView * tqparent = 0l ); + static ItemEditor * self( KateMDI::ToolView * parent = 0l ); ~ItemEditor(); static TQString toolViewIdentifier() { return "ItemEditor"; } @@ -71,7 +71,7 @@ class ItemEditor : public TQWidget void mergeProperties(); private: - ItemEditor( KateMDI::ToolView * tqparent ); + ItemEditor( KateMDI::ToolView * parent ); TQLabel *m_nameLbl; TQPushButton *m_defaultsBtn; diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index 38db8f3..539bc40 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -30,16 +30,16 @@ #include -ILVItem::ILVItem( TQListView* tqparent, const TQString &id ) - : KListViewItem( tqparent, 0 ) +ILVItem::ILVItem( TQListView* parent, const TQString &id ) + : KListViewItem( parent, 0 ) { m_id = id; b_isRemovable = false; m_pProjectItem = 0l; } -ILVItem::ILVItem( TQListViewItem* tqparent, const TQString &id ) - : KListViewItem( tqparent, 0 ) +ILVItem::ILVItem( TQListViewItem* parent, const TQString &id ) + : KListViewItem( parent, 0 ) { m_id = id; b_isRemovable = false; @@ -47,8 +47,8 @@ ILVItem::ILVItem( TQListViewItem* tqparent, const TQString &id ) } -ItemSelector::ItemSelector( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +ItemSelector::ItemSelector( TQWidget *parent, const char *name ) + : KListView( parent, name ) { addColumn( i18n( "Component" ) ); setFullWidth(true); @@ -120,7 +120,7 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const if ( !parentItem ) { - kdError() << "Unexpected error in finding tqparent item for category list"<key( 0, 0 ) ); - ILVItem *tqparent = dynamic_cast(item->TQListViewItem::tqparent()); + ILVItem *parent = dynamic_cast(item->TQListViewItem::parent()); delete item; // Get rid of the category as well if it has no tqchildren - if ( tqparent && !tqparent->firstChild() ) + if ( parent && !parent->firstChild() ) { - m_categories.remove(tqparent->text(0)); - delete tqparent; + m_categories.remove(parent->text(0)); + delete parent; } } @@ -267,19 +267,19 @@ TQDragObject* ItemSelector::dragObject() ComponentSelector * ComponentSelector::m_pSelf = 0l; -ComponentSelector * ComponentSelector::self( KateMDI::ToolView * tqparent ) +ComponentSelector * ComponentSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ComponentSelector(tqparent); + assert(parent); + m_pSelf = new ComponentSelector(parent); } return m_pSelf; } -ComponentSelector::ComponentSelector( KateMDI::ToolView * tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Component Selector" ) +ComponentSelector::ComponentSelector( KateMDI::ToolView * parent ) + : ItemSelector( (TQWidget*)parent, "Component Selector" ) { TQWhatsThis::add( this, i18n( "Add components to the circuit diagram by dragging them into the circuit.

" @@ -307,19 +307,19 @@ ComponentSelector::ComponentSelector( KateMDI::ToolView * tqparent ) FlowPartSelector * FlowPartSelector::m_pSelf = 0l; -FlowPartSelector * FlowPartSelector::self( KateMDI::ToolView * tqparent ) +FlowPartSelector * FlowPartSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new FlowPartSelector(tqparent); + assert(parent); + m_pSelf = new FlowPartSelector(parent); } return m_pSelf; } -FlowPartSelector::FlowPartSelector( KateMDI::ToolView * tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Part Selector" ) +FlowPartSelector::FlowPartSelector( KateMDI::ToolView * parent ) + : ItemSelector( (TQWidget*)parent, "Part Selector" ) { TQWhatsThis::add( this, i18n("Add FlowPart to the FlowCode document by dragging them there.

To add more than one FlowPart of the same type, doubleclick on a FlowPart, and click repeatedly in the FlowChart to place the component. Right click to stop placement.") ); @@ -340,19 +340,19 @@ FlowPartSelector::FlowPartSelector( KateMDI::ToolView * tqparent ) MechanicsSelector * MechanicsSelector::m_pSelf = 0l; -MechanicsSelector * MechanicsSelector::self( KateMDI::ToolView * tqparent ) +MechanicsSelector * MechanicsSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new MechanicsSelector( (TQWidget*)tqparent ); + assert(parent); + m_pSelf = new MechanicsSelector( (TQWidget*)parent ); } return m_pSelf; } -MechanicsSelector::MechanicsSelector( TQWidget *tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Mechanics Selector" ) +MechanicsSelector::MechanicsSelector( TQWidget *parent ) + : ItemSelector( (TQWidget*)parent, "Mechanics Selector" ) { TQWhatsThis::add( this, i18n("Add mechanical parts to the mechanics work area by dragging them there.") ); diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h index 28f31b2..d0fd691 100644 --- a/src/gui/itemselector.h +++ b/src/gui/itemselector.h @@ -27,8 +27,8 @@ namespace KateMDI { class ToolView; } class ILVItem : public TQObject, public KListViewItem { public: - ILVItem( TQListView *tqparent, const TQString &id ); - ILVItem( TQListViewItem *tqparent, const TQString &id ); + ILVItem( TQListView *parent, const TQString &id ); + ILVItem( TQListViewItem *parent, const TQString &id ); void setProjectItem( ProjectItem * projectItem ) { m_pProjectItem = projectItem; } ProjectItem * projectItem() const { return m_pProjectItem; } @@ -60,7 +60,7 @@ class ItemSelector : public KListView Q_OBJECT TQ_OBJECT public: - ItemSelector( TQWidget *tqparent, const char *name ); + ItemSelector( TQWidget *parent, const char *name ); ~ItemSelector(); /** * Adds a listview item to the ListView @@ -91,7 +91,7 @@ class ItemSelector : public KListView */ void setListCaption( const TQString &caption ); /** - * Writes the open status (folded or unfolded) of "tqparent" items in the view + * Writes the open status (folded or unfolded) of "parent" items in the view * to the config file. */ void writeOpenStates(); @@ -124,11 +124,11 @@ class ComponentSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static ComponentSelector * self( KateMDI::ToolView * tqparent = 0l ); + static ComponentSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "ComponentSelector"; } private: - ComponentSelector( KateMDI::ToolView * tqparent ); + ComponentSelector( KateMDI::ToolView * parent ); static ComponentSelector * m_pSelf; }; @@ -142,11 +142,11 @@ class FlowPartSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static FlowPartSelector * self( KateMDI::ToolView * tqparent = 0l ); + static FlowPartSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "FlowPartSelector"; } private: - FlowPartSelector( KateMDI::ToolView * tqparent ); + FlowPartSelector( KateMDI::ToolView * parent ); static FlowPartSelector * m_pSelf; }; @@ -159,11 +159,11 @@ class MechanicsSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static MechanicsSelector * self( KateMDI::ToolView * tqparent = 0l ); + static MechanicsSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "MechanicsSelector"; } private: - MechanicsSelector( TQWidget *tqparent = 0L ); + MechanicsSelector( TQWidget *parent = 0L ); static MechanicsSelector * m_pSelf; }; diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp index a158049..574d967 100644 --- a/src/gui/logview.cpp +++ b/src/gui/logview.cpp @@ -18,8 +18,8 @@ //BEGIN class LogView -LogView::LogView( KateMDI::ToolView * tqparent, const char *name ) - : KTextEdit( tqparent, name ) +LogView::LogView( KateMDI::ToolView * parent, const char *name ) + : KTextEdit( parent, name ) { setReadOnly(true); setPaper( TQt::white ); diff --git a/src/gui/logview.h b/src/gui/logview.h index a2b9487..74663d4 100644 --- a/src/gui/logview.h +++ b/src/gui/logview.h @@ -44,7 +44,7 @@ class LogView : public KTextEdit Q_OBJECT TQ_OBJECT public: - LogView( KateMDI::ToolView * tqparent, const char *name = 0 ); + LogView( KateMDI::ToolView * parent, const char *name = 0 ); ~LogView(); enum OutputType diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp index a1af719..59dfa33 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -22,8 +22,8 @@ #include #include -MicroSelectWidget::MicroSelectWidget( TQWidget* tqparent, const char* name, WFlags ) - : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), tqparent, name ) +MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags ) + : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), parent, name ) { m_allowedAsmSet = AsmInfo::AsmSetAll; m_allowedGpsimSupport = m_allowedFlowCodeSupport = m_allowedMicrobeSupport = MicroInfo::AllSupport; diff --git a/src/gui/microselectwidget.h b/src/gui/microselectwidget.h index 6555a1e..81de13e 100644 --- a/src/gui/microselectwidget.h +++ b/src/gui/microselectwidget.h @@ -30,7 +30,7 @@ class MicroSelectWidget : public TQGroupBox TQ_OBJECT public: - MicroSelectWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + MicroSelectWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MicroSelectWidget(); void setMicro( const TQString & id ); diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index 0b61cc5..d8d3a05 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -31,8 +31,8 @@ #include #include -MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("PIC Settings"), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, true ) +MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("PIC Settings"), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pMicroSettings = microSettings; m_pNewPinMappingWidget = 0l; diff --git a/src/gui/microsettingsdlg.h b/src/gui/microsettingsdlg.h index 3e47bfb..e89b0f0 100644 --- a/src/gui/microsettingsdlg.h +++ b/src/gui/microsettingsdlg.h @@ -33,7 +33,7 @@ class MicroSettingsDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *tqparent = 0L, const char *name = 0L ); + MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *parent = 0L, const char *name = 0L ); ~MicroSettingsDlg(); void reject(); diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index 79c35dd..9da23e2 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -33,10 +33,10 @@ #include -NewFileDlg::NewFileDlg( TQWidget *tqparent ) - : KDialogBase( tqparent, "newfiledlg", true, "New File", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +NewFileDlg::NewFileDlg( TQWidget *parent ) + : KDialogBase( parent, "newfiledlg", true, "New File", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { - m_pMainParent = tqparent; + m_pMainParent = parent; m_bAccepted = false; m_pNewFileWidget = new NewFileWidget(this); diff --git a/src/gui/newfiledlg.h b/src/gui/newfiledlg.h index 28d3959..19a1b85 100644 --- a/src/gui/newfiledlg.h +++ b/src/gui/newfiledlg.h @@ -27,7 +27,7 @@ class NewFileDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewFileDlg( TQWidget *tqparent ); + NewFileDlg( TQWidget *parent ); void reject(); void accept(); diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp index 134a958..19f88c3 100644 --- a/src/gui/orientationwidget.cpp +++ b/src/gui/orientationwidget.cpp @@ -27,8 +27,8 @@ const int _size = 44; -OrientationWidget::OrientationWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 ); p_activeFlowPart = 0l; diff --git a/src/gui/orientationwidget.h b/src/gui/orientationwidget.h index 84d2071..a48bf37 100644 --- a/src/gui/orientationwidget.h +++ b/src/gui/orientationwidget.h @@ -27,7 +27,7 @@ class OrientationWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - OrientationWidget( TQWidget *tqparent = 0l, const char *name = 0l ); + OrientationWidget( TQWidget *parent = 0l, const char *name = 0l ); ~OrientationWidget(); public slots: diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 24495ab..6206134 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -47,19 +47,19 @@ TQColor probeColors[9] = { Oscilloscope * Oscilloscope::m_pSelf = 0l; -Oscilloscope * Oscilloscope::self( KateMDI::ToolView * tqparent ) +Oscilloscope * Oscilloscope::self( KateMDI::ToolView * parent ) { if ( !m_pSelf ) { - assert(tqparent); - m_pSelf = new Oscilloscope(tqparent); + assert(parent); + m_pSelf = new Oscilloscope(parent); } return m_pSelf; } -Oscilloscope::Oscilloscope( KateMDI::ToolView * tqparent ) - : OscilloscopeWidget(tqparent) +Oscilloscope::Oscilloscope( KateMDI::ToolView * parent ) + : OscilloscopeWidget(parent) { m_nextColor = 0; m_nextId = 1; diff --git a/src/gui/oscilloscope.h b/src/gui/oscilloscope.h index 1d1503e..0ded495 100644 --- a/src/gui/oscilloscope.h +++ b/src/gui/oscilloscope.h @@ -78,7 +78,7 @@ class Oscilloscope : public OscilloscopeWidget Q_OBJECT TQ_OBJECT public: - static Oscilloscope * self( KateMDI::ToolView * tqparent = 0l ); + static Oscilloscope * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "Oscilloscope"; } virtual ~Oscilloscope(); @@ -177,7 +177,7 @@ class Oscilloscope : public OscilloscopeWidget void updateScrollbars(); private: - Oscilloscope( KateMDI::ToolView * tqparent ); + Oscilloscope( KateMDI::ToolView * parent ); static Oscilloscope * m_pSelf; double m_zoomLevel; diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index aa05311..f74a822 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -37,8 +37,8 @@ inline ullong min( ullong a, ullong b ) } -OscilloscopeView::OscilloscopeView( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WNoAutoErase ), +OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WNoAutoErase ), b_needRedraw(true), m_pixmap(0l), m_fps(10), diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h index d9daaa0..b4e6a10 100644 --- a/src/gui/oscilloscopeview.h +++ b/src/gui/oscilloscopeview.h @@ -28,7 +28,7 @@ class OscilloscopeView : public TQFrame Q_OBJECT TQ_OBJECT public: - OscilloscopeView( TQWidget *tqparent, const char *name = 0 ); + OscilloscopeView( TQWidget *parent, const char *name = 0 ); virtual ~OscilloscopeView(); public slots: diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp index 32349e6..9260fdc 100644 --- a/src/gui/outputmethoddlg.cpp +++ b/src/gui/outputmethoddlg.cpp @@ -66,8 +66,8 @@ void OutputMethodInfo::initialize( OutputMethodDlg * dlg ) //BEGIN class OutputMethodDlg -OutputMethodDlg::OutputMethodDlg( const TQString &caption, const KURL & inputURL, bool showPICSelect, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel ) +OutputMethodDlg::OutputMethodDlg( const TQString &caption, const KURL & inputURL, bool showPICSelect, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, caption, Ok|Cancel ) { m_inputURL = inputURL; m_bAccepted = false; diff --git a/src/gui/outputmethoddlg.h b/src/gui/outputmethoddlg.h index 1bf4879..b18f8d7 100644 --- a/src/gui/outputmethoddlg.h +++ b/src/gui/outputmethoddlg.h @@ -69,7 +69,7 @@ class OutputMethodDlg : public KDialogBase * @param inputURL Used for saving/restoring previous options the user has selected for this file; set this to null if temporary file * @param showPICSelect Whether to show the combo boxes for selecting a PIC */ - OutputMethodDlg( const TQString & caption, const KURL & inputURL, bool showPICSelect = false, TQWidget *tqparent = 0, const char *name = 0); + OutputMethodDlg( const TQString & caption, const KURL & inputURL, bool showPICSelect = false, TQWidget *parent = 0, const char *name = 0); ~OutputMethodDlg(); void setOutputExtension( const TQString & outputExtension ); diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp index 7ca2663..5adce57 100644 --- a/src/gui/pieditor.cpp +++ b/src/gui/pieditor.cpp @@ -21,8 +21,8 @@ #include //BEGIN class PIEditor -PIEditor::PIEditor(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_id = id; m_data = data; @@ -43,8 +43,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIBool -PIBool::PIBool(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor( id, data, tqparent, name ) +PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor( id, data, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -79,8 +79,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIColor -PIColor::PIColor(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -114,8 +114,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIDouble -PIDouble::PIDouble(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -142,8 +142,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIFileName -PIFilename::PIFilename(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -193,8 +193,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIInt -PIInt::PIInt( const TQString &id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor( id, data, tqparent, name ) +PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor( id, data, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -221,8 +221,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ ) //BEGIN class PILineEdit -PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : PIEditor( id, data, tqparent, name) +PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name) + : PIEditor( id, data, parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -248,8 +248,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIStringCombo -PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : PIEditor( id, data, tqparent, name) +PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name) + : PIEditor( id, data, parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/src/gui/pieditor.h b/src/gui/pieditor.h index bc3c7fb..712959a 100644 --- a/src/gui/pieditor.h +++ b/src/gui/pieditor.h @@ -32,7 +32,7 @@ class PIEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - PIEditor(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIEditor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIEditor(); public slots: @@ -55,7 +55,7 @@ class PIBool : public PIEditor Q_OBJECT TQ_OBJECT public: - PIBool( TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0 ); + PIBool( TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0 ); ~PIBool(); void popup(); @@ -76,7 +76,7 @@ class PIColor : public PIEditor Q_OBJECT TQ_OBJECT public: - PIColor(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIColor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIColor(); void popup(); @@ -98,7 +98,7 @@ class PIDouble : public PIEditor Q_OBJECT TQ_OBJECT public: - PIDouble(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIDouble(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIDouble(); protected slots: @@ -118,7 +118,7 @@ class PIFilename : public PIEditor Q_OBJECT TQ_OBJECT public: - PIFilename(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIFilename(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIFilename(); protected slots: @@ -140,7 +140,7 @@ class PIInt : public PIEditor Q_OBJECT TQ_OBJECT public: - PIInt( const TQString &id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIInt( const TQString &id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIInt(); protected slots: @@ -160,7 +160,7 @@ class PILineEdit : public PIEditor Q_OBJECT TQ_OBJECT public: - PILineEdit(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PILineEdit(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PILineEdit(); protected slots: @@ -180,7 +180,7 @@ class PIStringCombo : public PIEditor Q_OBJECT TQ_OBJECT public: - PIStringCombo(TQString id, Variant *data, TQWidget *tqparent, const char *name = 0); + PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name = 0); ~PIStringCombo(); void popup(); diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp index 5cf8ee2..481612c 100644 --- a/src/gui/probepositioner.cpp +++ b/src/gui/probepositioner.cpp @@ -20,8 +20,8 @@ #include #include -ProbePositioner::ProbePositioner(TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name, WNoAutoErase ) +ProbePositioner::ProbePositioner(TQWidget *parent, const char *name) + : TQWidget( parent, name, WNoAutoErase ) { m_probePosOffset = 0; p_draggedProbe = 0l; diff --git a/src/gui/probepositioner.h b/src/gui/probepositioner.h index c99c0ab..a28c6c6 100644 --- a/src/gui/probepositioner.h +++ b/src/gui/probepositioner.h @@ -28,7 +28,7 @@ class ProbePositioner : public TQWidget Q_OBJECT TQ_OBJECT public: - ProbePositioner(TQWidget *tqparent = 0, const char *name = 0); + ProbePositioner(TQWidget *parent = 0, const char *name = 0); ~ProbePositioner(); /** * Returns the amount of space (height in pixels) that a probe output diff --git a/src/gui/programmerdlg.cpp b/src/gui/programmerdlg.cpp index 9473720..c8a8066 100644 --- a/src/gui/programmerdlg.cpp +++ b/src/gui/programmerdlg.cpp @@ -21,8 +21,8 @@ #include #include -ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("PIC Programmer"), Ok|Cancel ) +ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("PIC Programmer"), Ok|Cancel ) { // Change the "Ok" button to a "Burn" button KGuiItem burnItem = KStdGuiItem::ok(); diff --git a/src/gui/programmerdlg.h b/src/gui/programmerdlg.h index 1c3fa63..20431cd 100644 --- a/src/gui/programmerdlg.h +++ b/src/gui/programmerdlg.h @@ -32,7 +32,7 @@ class ProgrammerDlg : public KDialogBase * options (such as the program to use) will be read in from the * settings. */ - ProgrammerDlg( const TQString & picID, TQWidget * tqparent = 0, const char * name = 0 ); + ProgrammerDlg( const TQString & picID, TQWidget * parent = 0, const char * name = 0 ); ~ProgrammerDlg(); virtual void reject(); diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index 287b8c5..a2ff54e 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -30,8 +30,8 @@ #include //BEGIN class NewProjectDlg -NewProjectDlg::NewProjectDlg( TQWidget * tqparent ) - : KDialogBase( tqparent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +NewProjectDlg::NewProjectDlg( TQWidget * parent ) + : KDialogBase( parent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pWidget = new NewProjectWidget(this); connect( m_pWidget->projectNameEdit, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) ); @@ -88,8 +88,8 @@ void NewProjectDlg::locationChanged( const TQString & ) //BEGIN class CreateSubprojectDlg -CreateSubprojectDlg::CreateSubprojectDlg( TQWidget * tqparent ) - : KDialogBase( tqparent, "Create Subproject Dialog", true, "Create Subproject", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +CreateSubprojectDlg::CreateSubprojectDlg( TQWidget * parent ) + : KDialogBase( parent, "Create Subproject Dialog", true, "Create Subproject", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pWidget = new CreateSubprojectWidget(this); @@ -128,8 +128,8 @@ void CreateSubprojectDlg::reject() //BEGIN class LinkerOptionsDlg -LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *tqparent ) - : KDialogBase( tqparent, "Linker Options Dialog", true, "Linker Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent ) + : KDialogBase( parent, "Linker Options Dialog", true, "Linker Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pLinkerOptions = linkingOptions; m_pWidget = new LinkerOptionsWidget(this); @@ -218,8 +218,8 @@ void LinkerOptionsDlg::reject() //BEGIN class ProcessingOptionsDlg -ProcessingOptionsDlg::ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *tqparent ) - : KDialogBase( tqparent, "Processing Options Dialog", true, "Processing Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +ProcessingOptionsDlg::ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *parent ) + : KDialogBase( parent, "Processing Options Dialog", true, "Processing Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pProjectItem = projectItem; m_pWidget = new ProcessingOptionsWidget(this); diff --git a/src/gui/projectdlgs.h b/src/gui/projectdlgs.h index 5219072..78ca741 100644 --- a/src/gui/projectdlgs.h +++ b/src/gui/projectdlgs.h @@ -32,7 +32,7 @@ class NewProjectDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewProjectDlg( TQWidget * tqparent ); + NewProjectDlg( TQWidget * parent ); /** * Called when the 'Cancel' button is pressed. @@ -75,7 +75,7 @@ class CreateSubprojectDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - CreateSubprojectDlg( TQWidget *tqparent = 0 ); + CreateSubprojectDlg( TQWidget *parent = 0 ); ~CreateSubprojectDlg(); // The following values should agree with the positions in the combo box @@ -115,7 +115,7 @@ class LinkerOptionsDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *tqparent = 0 ); + LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent = 0 ); virtual ~LinkerOptionsDlg(); /** @@ -141,7 +141,7 @@ class LinkerOptionsDlg : public KDialogBase class ProcessingOptionsDlg : public KDialogBase { public: - ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *tqparent = 0 ); + ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *parent = 0 ); virtual ~ProcessingOptionsDlg(); /** diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp index 7e55ed0..75d21ba 100644 --- a/src/gui/propertieslistview.cpp +++ b/src/gui/propertieslistview.cpp @@ -25,8 +25,8 @@ #include #include -PropertiesListView::PropertiesListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +PropertiesListView::PropertiesListView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Property")); addColumn(i18n("Data")); diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h index a879ae7..31a5df4 100644 --- a/src/gui/propertieslistview.h +++ b/src/gui/propertieslistview.h @@ -31,7 +31,7 @@ class PropertiesListView : public KListView Q_OBJECT TQ_OBJECT public: - PropertiesListView( TQWidget *tqparent = 0l, const char *name = 0l ); + PropertiesListView( TQWidget *parent = 0l, const char *name = 0l ); ~PropertiesListView(); public slots: diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 5d9511e..72a7a07 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -40,8 +40,8 @@ // Make sure that this value is the same as that in ktechlab.kcfg const int defaultRefreshRate = 50; -SettingsDlg::SettingsDlg( TQWidget *tqparent, const char *name, KConfigSkeleton *config ) - : KConfigDialog( tqparent, name, config ) +SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ) + : KConfigDialog( parent, name, config ) { m_generalOptionsWidget = new GeneralOptionsWidget( this, "generalOptionsWidget" ); m_gpasmSettingsWidget = new GpasmSettingsWidget( this, "gpasmSettingsWidget" ); diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h index 41f5b55..9f2af44 100644 --- a/src/gui/settingsdlg.h +++ b/src/gui/settingsdlg.h @@ -31,7 +31,7 @@ class SettingsDlg : public KConfigDialog Q_OBJECT TQ_OBJECT public: - SettingsDlg( TQWidget *tqparent, const char *name, KConfigSkeleton *config ); + SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ); ~SettingsDlg(); static int refreshRateToSliderValue( int refreshRate ); diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index da4d6bd..170880b 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -61,18 +61,18 @@ void SymbolViewerItem::radixChanged() //BEGIN class SymbolView SymbolViewer * SymbolViewer::m_pSelf = 0l; -SymbolViewer * SymbolViewer::self( KateMDI::ToolView * tqparent ) +SymbolViewer * SymbolViewer::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert (tqparent); - m_pSelf = new SymbolViewer(tqparent); + assert (parent); + m_pSelf = new SymbolViewer(parent); } return m_pSelf; } -SymbolViewer::SymbolViewer( KateMDI::ToolView * tqparent ) - : TQWidget( (TQWidget*)tqparent ) +SymbolViewer::SymbolViewer( KateMDI::ToolView * parent ) + : TQWidget( (TQWidget*)parent ) { TQGridLayout * grid = new TQGridLayout( this, 1, 1, 0, 6 ); diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index ed2fcee..ac085eb 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -32,7 +32,7 @@ class SymbolViewer : public TQWidget Q_OBJECT TQ_OBJECT public: - static SymbolViewer * self( KateMDI::ToolView * tqparent = 0l ); + static SymbolViewer * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "SymbolViewer"; } ~SymbolViewer(); @@ -78,7 +78,7 @@ class SymbolViewer : public TQWidget Radix m_valueRadix; private: - SymbolViewer( KateMDI::ToolView * tqparent ); + SymbolViewer( KateMDI::ToolView * parent ); static SymbolViewer * m_pSelf; KComboBox * m_pRadixCombo; }; -- cgit v1.2.1