diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | eb570158698cf61dad4f77d950ef908160f6c3cc (patch) | |
tree | 649bf182bcf0a20bed5035d25ffd77de5aee138a /libkdeedu | |
parent | d8762de95349dc6edaa34db9bf699b367c1af6b1 (diff) | |
download | tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.tar.gz tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdeedu')
-rw-r--r-- | libkdeedu/extdate/extdatepicker.cpp | 12 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatepicker.h | 6 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatetbl.cpp | 24 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatetbl.h | 12 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatetimeedit.cpp | 46 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatetimeedit.h | 22 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatewidget.cpp | 12 | ||||
-rw-r--r-- | libkdeedu/extdate/extdatewidget.h | 4 | ||||
-rw-r--r-- | libkdeedu/extdate/testwidget.h | 2 | ||||
-rw-r--r-- | libkdeedu/kdeeduplot/kplotwidget.cpp | 6 | ||||
-rw-r--r-- | libkdeedu/kdeeduplot/kplotwidget.h | 4 | ||||
-rw-r--r-- | libkdeedu/kdeeduui/kdeeduglossary.cpp | 4 | ||||
-rw-r--r-- | libkdeedu/kdeeduui/kdeeduglossary.h | 2 |
13 files changed, 78 insertions, 78 deletions
diff --git a/libkdeedu/extdate/extdatepicker.cpp b/libkdeedu/extdate/extdatepicker.cpp index 5a5864d2..791b6db6 100644 --- a/libkdeedu/extdate/extdatepicker.cpp +++ b/libkdeedu/extdate/extdatepicker.cpp @@ -83,20 +83,20 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) } } -ExtDatePicker::ExtDatePicker(TQWidget *tqparent, ExtDate dt, const char *name) - : TQFrame(tqparent,name) +ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name) + : TQFrame(parent,name) { init( dt ); } -ExtDatePicker::ExtDatePicker(TQWidget *tqparent, ExtDate dt, const char *name, WFlags f) - : TQFrame(tqparent,name, f) +ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name, WFlags f) + : TQFrame(parent,name, f) { init( dt ); } -ExtDatePicker::ExtDatePicker( TQWidget *tqparent, const char *name ) - : TQFrame(tqparent,name) +ExtDatePicker::ExtDatePicker( TQWidget *parent, const char *name ) + : TQFrame(parent,name) { init( ExtDate::tqcurrentDate() ); } diff --git a/libkdeedu/extdate/extdatepicker.h b/libkdeedu/extdate/extdatepicker.h index fa4a1fef..794ccea6 100644 --- a/libkdeedu/extdate/extdatepicker.h +++ b/libkdeedu/extdate/extdatepicker.h @@ -61,7 +61,7 @@ public: /** The usual constructor. The given date will be displayed * initially. **/ - ExtDatePicker(TQWidget *tqparent=0, + ExtDatePicker(TQWidget *parent=0, ExtDate=ExtDate::tqcurrentDate(), const char *name=0); @@ -69,7 +69,7 @@ public: * initially. * @since 3.1 **/ - ExtDatePicker(TQWidget *tqparent, + ExtDatePicker(TQWidget *parent, ExtDate, const char *name, WFlags f); // ### KDE 4.0: Merge @@ -79,7 +79,7 @@ public: * current date. * @since 3.1 */ - ExtDatePicker( TQWidget *tqparent, const char *name ); + ExtDatePicker( TQWidget *parent, const char *name ); /** * The destructor. diff --git a/libkdeedu/extdate/extdatetbl.cpp b/libkdeedu/extdate/extdatetbl.cpp index ec23d33a..6d94bef6 100644 --- a/libkdeedu/extdate/extdatetbl.cpp +++ b/libkdeedu/extdate/extdatetbl.cpp @@ -82,8 +82,8 @@ public: }; -ExtDateValidator::ExtDateValidator(TQWidget* tqparent, const char* name) - : TQValidator(TQT_TQOBJECT(tqparent), name) +ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name) + : TQValidator(TQT_TQOBJECT(parent), name) { } @@ -116,8 +116,8 @@ ExtDateValidator::fixup( TQString& ) const } -ExtDateTable::ExtDateTable(TQWidget *tqparent, ExtDate date_, const char* name, WFlags f) - : TQGridView(tqparent, name, f) +ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WFlags f) + : TQGridView(parent, name, f) { d = new ExtDateTablePrivate; setFontSize(10); @@ -565,8 +565,8 @@ void ExtDateTable::unsetCustomDatePainting( const ExtDate &date ) } ExtDateInternalWeekSelector::ExtDateInternalWeekSelector -(TQWidget* tqparent, const char* name) - : KLineEdit(tqparent, name), +(TQWidget* parent, const char* name) + : KLineEdit(parent, name), val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { @@ -638,8 +638,8 @@ ExtDateInternalMonthPicker::~ExtDateInternalMonthPicker() { } ExtDateInternalMonthPicker::ExtDateInternalMonthPicker -(const ExtDate & date, TQWidget* tqparent, const char* name) - : TQGridView(tqparent, name), +(const ExtDate & date, TQWidget* parent, const char* name) + : TQGridView(parent, name), result(0) // invalid { //FIXME: Can't uncomment the following unless ExtDate is moved to kdelibs @@ -811,8 +811,8 @@ ExtDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) ExtDateInternalYearSelector::ExtDateInternalYearSelector -(TQWidget* tqparent, const char* name) - : TQLineEdit(tqparent, name), +(TQWidget* parent, const char* name) + : TQLineEdit(parent, name), val(new TQIntValidator(TQT_TQOBJECT(this))), result(0), d(new ExtDateInternalYearPrivate()) @@ -873,8 +873,8 @@ ExtDateInternalYearSelector::setYear(int year) setText(temp); } -KPopupFrame::KPopupFrame(TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name, WType_Popup), +KPopupFrame::KPopupFrame(TQWidget* parent, const char* name) + : TQFrame(parent, name, WType_Popup), result(0), // rejected main(0) { diff --git a/libkdeedu/extdate/extdatetbl.h b/libkdeedu/extdate/extdatetbl.h index ef3bd9d8..fbbc880b 100644 --- a/libkdeedu/extdate/extdatetbl.h +++ b/libkdeedu/extdate/extdatetbl.h @@ -51,7 +51,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalWeekSelector( TQWidget* tqparent=0, const char* name=0); + ExtDateInternalWeekSelector( TQWidget* parent=0, const char* name=0); int getWeek(); void setWeek(int week); @@ -93,7 +93,7 @@ public: /** * The constructor. */ - ExtDateInternalMonthPicker(const ExtDate& date, TQWidget* tqparent, const char* name=0); + ExtDateInternalMonthPicker(const ExtDate& date, TQWidget* parent, const char* name=0); /** * The destructor. */ @@ -152,7 +152,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalYearSelector( TQWidget* tqparent=0, const char* name=0); + ExtDateInternalYearSelector( TQWidget* parent=0, const char* name=0); ~ExtDateInternalYearSelector(); int getYear(); void setYear(int year); @@ -204,7 +204,7 @@ public: /** * The contructor. Creates a dialog without buttons. */ - KPopupFrame(TQWidget* tqparent=0, const char* name=0); + KPopupFrame(TQWidget* parent=0, const char* name=0); /** * Set the main widget. You cannot set the main widget from the constructor, * since it must be a child of the frame itselfes. @@ -247,7 +247,7 @@ private: class ExtDateValidator : public TQValidator { public: - ExtDateValidator(TQWidget* tqparent=0, const char* name=0); + ExtDateValidator(TQWidget* parent=0, const char* name=0); virtual State validate(TQString&, int&) const; virtual void fixup ( TQString & input ) const; State date(const TQString&, ExtDate&) const; @@ -277,7 +277,7 @@ public: /** * The constructor. */ - ExtDateTable(TQWidget *tqparent=0, + ExtDateTable(TQWidget *parent=0, ExtDate date=ExtDate::tqcurrentDate(), const char* name=0, WFlags f=0); diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp index 61331bc9..796bd858 100644 --- a/libkdeedu/extdate/extdatetimeedit.cpp +++ b/libkdeedu/extdate/extdatetimeedit.cpp @@ -342,15 +342,15 @@ private: }; /*! - Constructs an empty datetime editor with tqparent \a tqparent and + Constructs an empty datetime editor with parent \a parent and called \a name. */ -ExtDateTimeEditor::ExtDateTimeEditor( ExtDateTimeEditBase * tqparent, +ExtDateTimeEditor::ExtDateTimeEditor( ExtDateTimeEditBase * parent, const char * name ) - : TQWidget( tqparent, name, WNoAutoErase ) + : TQWidget( parent, name, WNoAutoErase ) { d = new ExtDateTimeEditorPrivate(); - cw = tqparent; + cw = parent; init(); } @@ -792,12 +792,12 @@ public: */ /*! - Constructs an empty date editor which is a child of \a tqparent and + Constructs an empty date editor which is a child of \a parent and called name \a name. */ -ExtDateEdit::ExtDateEdit( TQWidget * tqparent, const char * name ) - : ExtDateTimeEditBase( tqparent, name ) +ExtDateEdit::ExtDateEdit( TQWidget * parent, const char * name ) + : ExtDateTimeEditBase( parent, name ) { init(); updateButtons(); @@ -806,14 +806,14 @@ ExtDateEdit::ExtDateEdit( TQWidget * tqparent, const char * name ) /*! \overload - Constructs a date editor with the initial value \a date, tqparent \a - tqparent and called \a name. + Constructs a date editor with the initial value \a date, parent \a + parent and called \a name. The date editor is initialized with \a date. */ -ExtDateEdit::ExtDateEdit( const ExtDate& date, TQWidget * tqparent, const char * name ) - : ExtDateTimeEditBase( tqparent, name ) +ExtDateEdit::ExtDateEdit( const ExtDate& date, TQWidget * parent, const char * name ) + : ExtDateTimeEditBase( parent, name ) { init(); setDate( date ); @@ -1706,12 +1706,12 @@ public: // /*! -// Constructs an empty time edit with tqparent \a tqparent and called \a +// Constructs an empty time edit with parent \a parent and called \a // name. // */ // -// TQTimeEdit::TQTimeEdit( TQWidget * tqparent, const char * name ) -// : ExtDateTimeEditBase( tqparent, name ) +// TQTimeEdit::TQTimeEdit( TQWidget * parent, const char * name ) +// : ExtDateTimeEditBase( parent, name ) // { // init(); // } @@ -1720,11 +1720,11 @@ public: // \overload // // Constructs a time edit with the initial time value, \a time, -// tqparent \a tqparent and called \a name. +// parent \a parent and called \a name. // */ // -// TQTimeEdit::TQTimeEdit( const TQTime& time, TQWidget * tqparent, const char * name ) -// : ExtDateTimeEditBase( tqparent, name ) +// TQTimeEdit::TQTimeEdit( const TQTime& time, TQWidget * parent, const char * name ) +// : ExtDateTimeEditBase( parent, name ) // { // init(); // setTime( time ); @@ -2528,11 +2528,11 @@ public: */ /*! - Constructs an empty datetime edit with tqparent \a tqparent and called + Constructs an empty datetime edit with parent \a parent and called \a name. */ -ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) +ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { init(); } @@ -2542,11 +2542,11 @@ ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * tqparent, const char * name ) \overload Constructs a datetime edit with the initial value \a datetime, - tqparent \a tqparent and called \a name. + parent \a parent and called \a name. */ ExtDateTimeEdit::ExtDateTimeEdit( const ExtDateTime& datetime, - TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) + TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { init(); setDateTime( datetime ); diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h index 3aad17d9..1e82fe92 100644 --- a/libkdeedu/extdate/extdatetimeedit.h +++ b/libkdeedu/extdate/extdatetimeedit.h @@ -41,8 +41,8 @@ class ExtDateTimeEditBase : public TQWidget Q_OBJECT TQ_OBJECT public: - ExtDateTimeEditBase( TQWidget* tqparent=0, const char* name=0 ) - : TQWidget( tqparent, name ) {} + ExtDateTimeEditBase( TQWidget* parent=0, const char* name=0 ) + : TQWidget( parent, name ) {} virtual bool setFocusSection( int sec ) = 0; virtual TQString sectionFormattedText( int sec ) = 0; @@ -74,8 +74,8 @@ class KDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase // TQ_PROPERTY( ExtDate minValue READ minValue WRITE setMinValue ) public: - ExtDateEdit( TQWidget* tqparent=0, const char* name=0 ); - ExtDateEdit( const ExtDate& date, TQWidget* tqparent=0, const char* name=0 ); + ExtDateEdit( TQWidget* parent=0, const char* name=0 ); + ExtDateEdit( const ExtDate& date, TQWidget* parent=0, const char* name=0 ); ~ExtDateEdit(); enum Order { DMY /**< Day-Month-Year */, @@ -166,8 +166,8 @@ private: // AMPM = 0x10 // }; // -// TQTimeEdit( TQWidget* tqparent=0, const char* name=0 ); -// TQTimeEdit( const TQTime& time, TQWidget* tqparent=0, const char* name=0 ); +// TQTimeEdit( TQWidget* parent=0, const char* name=0 ); +// TQTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 ); // ~TQTimeEdit(); // // TQSize tqsizeHint() const; @@ -238,8 +238,8 @@ class KDE_EXPORT ExtDateTimeEdit : public TQWidget // TQ_PROPERTY( ExtDateTime dateTime READ dateTime WRITE setDateTime ) public: - ExtDateTimeEdit( TQWidget* tqparent=0, const char* name=0 ); - ExtDateTimeEdit( const ExtDateTime& datetime, TQWidget* tqparent=0, + ExtDateTimeEdit( TQWidget* parent=0, const char* name=0 ); + ExtDateTimeEdit( const ExtDateTime& datetime, TQWidget* parent=0, const char* name=0 ); ~ExtDateTimeEdit(); @@ -311,7 +311,7 @@ class ExtDateTimeEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - ExtDateTimeEditor( ExtDateTimeEditBase * tqparent=0, + ExtDateTimeEditor( ExtDateTimeEditBase * parent=0, const char * name=0 ); ~ExtDateTimeEditor(); @@ -347,8 +347,8 @@ class ExtDateTimeSpinWidget : public TQSpinWidget Q_OBJECT TQ_OBJECT public: - ExtDateTimeSpinWidget( TQWidget *tqparent, const char *name ) - : TQSpinWidget( tqparent, name ) + ExtDateTimeSpinWidget( TQWidget *parent, const char *name ) + : TQSpinWidget( parent, name ) { } diff --git a/libkdeedu/extdate/extdatewidget.cpp b/libkdeedu/extdate/extdatewidget.cpp index f787293f..f1c7269b 100644 --- a/libkdeedu/extdate/extdatewidget.cpp +++ b/libkdeedu/extdate/extdatewidget.cpp @@ -33,8 +33,8 @@ class ExtDateWidgetSpinBox : public TQSpinBox { public: - ExtDateWidgetSpinBox(int min, int max, TQWidget *tqparent) - : TQSpinBox(min, max, 1, tqparent) + ExtDateWidgetSpinBox(int min, int max, TQWidget *parent) + : TQSpinBox(min, max, 1, parent) { editor()->tqsetAlignment(AlignRight); } @@ -53,16 +53,16 @@ public: }; -ExtDateWidget::ExtDateWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ExtDateWidget::ExtDateWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { init(ExtDate::tqcurrentDate()); setDate(ExtDate()); } -ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *tqparent, +ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { init(date); setDate(date); diff --git a/libkdeedu/extdate/extdatewidget.h b/libkdeedu/extdate/extdatewidget.h index 2aa2ee0d..4df9931a 100644 --- a/libkdeedu/extdate/extdatewidget.h +++ b/libkdeedu/extdate/extdatewidget.h @@ -42,12 +42,12 @@ public: /** * Constructs a date selection widget, initialized to the current CPU date. */ - ExtDateWidget( TQWidget *tqparent=0, const char *name=0 ); + ExtDateWidget( TQWidget *parent=0, const char *name=0 ); /** * Constructs a date selection widget with the initial date set to @p date. */ - ExtDateWidget( const ExtDate &date, TQWidget *tqparent=0, const char *name=0 ); + ExtDateWidget( const ExtDate &date, TQWidget *parent=0, const char *name=0 ); /** * Destructs the date selection widget. diff --git a/libkdeedu/extdate/testwidget.h b/libkdeedu/extdate/testwidget.h index 283cb3d4..a6ced942 100644 --- a/libkdeedu/extdate/testwidget.h +++ b/libkdeedu/extdate/testwidget.h @@ -33,7 +33,7 @@ class TestWidget : public KMainWindow { Q_OBJECT TQ_OBJECT public: - TestWidget( TQWidget *tqparent, const char *name ); + TestWidget( TQWidget *parent, const char *name ); ~TestWidget() {} public slots: diff --git a/libkdeedu/kdeeduplot/kplotwidget.cpp b/libkdeedu/kdeeduplot/kplotwidget.cpp index 22fba3b0..5f13de6e 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.cpp +++ b/libkdeedu/kdeeduplot/kplotwidget.cpp @@ -23,8 +23,8 @@ #include "kplotwidget.h" #include "kplotwidget.moc" -KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name, WNoAutoErase ), +KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) + : TQWidget( parent, name, WNoAutoErase ), dXtick(0.0), dYtick(0.0), nmajX(0), nminX(0), nmajY(0), nminY(0), ShowTickMarks( true ), ShowTickLabels( true ), ShowGrid( false ) @@ -223,7 +223,7 @@ void KPlotWidget::drawObjects( TQPainter *p ) { double KPlotWidget::dmod( double a, double b ) { return ( b * ( ( a / b ) - int( a / b ) ) ); } void KPlotWidget::drawBox( TQPainter *p ) { - //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data + //First, fill in padding region with bgColor() to mask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); diff --git a/libkdeedu/kdeeduplot/kplotwidget.h b/libkdeedu/kdeeduplot/kplotwidget.h index 27bd15a0..c886bbaf 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.h +++ b/libkdeedu/kdeeduplot/kplotwidget.h @@ -47,10 +47,10 @@ public: *@param x2 the maximum X value in data units *@param y1 the minimum Y value in data units *@param y2 the maximum Y value in data units - *@param tqparent the tqparent widget + *@param parent the parent widget *@param name name label for the KPlotWidget */ - KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); + KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); /**Destructor (empty) */ diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp index 4ab49437..760902c4 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp @@ -162,8 +162,8 @@ TQValueList<GlossaryItem*> Glossary::readItems( TQDomDocument &itemDocument ) -GlossaryDialog::GlossaryDialog( bool folded, TQWidget *tqparent, const char *name) - : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, tqparent, name, false ) +GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name) + : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, name, false ) { //this string will be used for all items. If a backgroundpicture should //be used call Glossary::setBackgroundPicture(). diff --git a/libkdeedu/kdeeduui/kdeeduglossary.h b/libkdeedu/kdeeduui/kdeeduglossary.h index e6a0622f..e5d29ba0 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.h +++ b/libkdeedu/kdeeduui/kdeeduglossary.h @@ -243,7 +243,7 @@ class GlossaryDialog : public KDialogBase TQ_OBJECT public: - GlossaryDialog( bool folded = true, TQWidget *tqparent=0, const char *name=0); + GlossaryDialog( bool folded = true, TQWidget *parent=0, const char *name=0); ~GlossaryDialog(); void keyPressEvent(TQKeyEvent*); |