diff options
Diffstat (limited to 'kregexpeditor')
-rw-r--r-- | kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp | 4 | ||||
-rw-r--r-- | kregexpeditor/compoundwidget.cpp | 6 | ||||
-rw-r--r-- | kregexpeditor/compoundwidget.h | 2 | ||||
-rw-r--r-- | kregexpeditor/concwidget.cpp | 4 | ||||
-rw-r--r-- | kregexpeditor/concwidget.h | 2 | ||||
-rw-r--r-- | kregexpeditor/multicontainerwidget.cpp | 4 | ||||
-rw-r--r-- | kregexpeditor/multicontainerwidget.h | 2 | ||||
-rw-r--r-- | kregexpeditor/regexpwidget.cpp | 4 | ||||
-rw-r--r-- | kregexpeditor/regexpwidget.h | 4 | ||||
-rw-r--r-- | kregexpeditor/selectablelineedit.cpp | 2 | ||||
-rw-r--r-- | kregexpeditor/selectablelineedit.h | 2 | ||||
-rw-r--r-- | kregexpeditor/singlecontainerwidget.cpp | 4 | ||||
-rw-r--r-- | kregexpeditor/singlecontainerwidget.h | 2 | ||||
-rw-r--r-- | kregexpeditor/textwidget.cpp | 6 | ||||
-rw-r--r-- | kregexpeditor/textwidget.h | 2 |
15 files changed, 25 insertions, 25 deletions
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index 31d7b5c..42d411b 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -44,7 +44,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to ) void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream ) { - // Only handle widgets. Alternatives to widgets are tqlayouts, validators, timers, etc. + // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc. if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; @@ -79,7 +79,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to ) { - // Only handle widgets. Alternatives to widgets are tqlayouts, validators, timers, etc. + // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc. if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index e55d5fe..3112416 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -280,17 +280,17 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) SingleContainerWidget::mouseReleaseEvent( event ); } -bool CompoundWidget::updateSelection( bool tqparentSelected ) +bool CompoundWidget::updateSelection( bool parentSelected ) { if ( _hidden ) { - bool changed = RegExpWidget::updateSelection( tqparentSelected ); + bool changed = RegExpWidget::updateSelection( parentSelected ); _child->selectWidget( _isSelected ); if (changed) tqrepaint(); return changed; } else { - return SingleContainerWidget::updateSelection( tqparentSelected ); + return SingleContainerWidget::updateSelection( parentSelected ); } } diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h index 6cea5b5..8a803a3 100644 --- a/kregexpeditor/compoundwidget.h +++ b/kregexpeditor/compoundwidget.h @@ -68,7 +68,7 @@ public: CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, TQWidget* tqparent, const char* name = 0); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return COMPOUND; } diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index fec2cc0..d70e735 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -229,10 +229,10 @@ RegExp* ConcWidget::regExp() const } } -bool ConcWidget::updateSelection(bool tqparentSelected) +bool ConcWidget::updateSelection(bool parentSelected) { bool isSel = _isSelected; - bool changed = MultiContainerWidget::updateSelection( tqparentSelected ); + bool changed = MultiContainerWidget::updateSelection( parentSelected ); _maxSelectedHeight = 0; diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index 073ff6e..49f6308 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -42,7 +42,7 @@ public: virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; - virtual bool updateSelection(bool tqparentSelected); + virtual bool updateSelection(bool parentSelected); virtual bool isSelected() const; virtual void applyRegExpToSelection( RegExpType type ); diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index e493b86..152f7a3 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -103,7 +103,7 @@ void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *chi qFatal("Accepter not found in list"); } -bool MultiContainerWidget::updateSelection(bool tqparentSelected) +bool MultiContainerWidget::updateSelection(bool parentSelected) { bool changed = false; bool isSel = _isSelected; @@ -114,7 +114,7 @@ bool MultiContainerWidget::updateSelection(bool tqparentSelected) oldState[i] = _tqchildren.at(i)->isSelected(); } - RegExpWidget::updateSelection( tqparentSelected ); + RegExpWidget::updateSelection( parentSelected ); int first; int last; diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 9cd9eaa..8194eb1 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -33,7 +33,7 @@ public: virtual void clearSelection(); virtual void deleteSelection(); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); - virtual bool updateSelection(bool tqparentSelected); + virtual bool updateSelection(bool parentSelected); virtual TQRect selectionRect() const; virtual RegExpWidget* widgetUnderPoint( TQPoint globalPos, bool justVisibleWidgets ); virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos ); diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index ec3c846..1e2ec6f 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -56,9 +56,9 @@ void RegExpWidget::setConcChild(ConcWidget *) qFatal("This widget should not expect any tqchildren"); } -bool RegExpWidget::updateSelection(bool tqparentSelected) +bool RegExpWidget::updateSelection(bool parentSelected) { - bool selected = ( tqparentSelected || + bool selected = ( parentSelected || _editorWindow->selectionOverlap( mapToGlobal( TQPoint(0,0) ), size() ) ) && !_isToplevel; diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 1774d40..0d65b8a 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -91,12 +91,12 @@ public: /** Update selection information for this widget. - @param tqparentSelected indicates whether the tqparent is selected. + @param parentSelected indicates whether the tqparent is selected. @return true if the selection state has changed for the widget since the last time the widget was painted. `tqrepaint' is invoked on the widget if selection state is changed, to ensure that selection is visible. */ - virtual bool updateSelection(bool tqparentSelected); + virtual bool updateSelection(bool parentSelected); /** Clears the selection and repaints the widget if `update' is true. diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index c9ed250..c0344e2 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -68,6 +68,6 @@ void SelectableLineEdit::slotKeyPressed() if ( actualSize > size().width()-frameWidth ) { tqrepaint(); - emit tqparentPleaseUpdate(); + emit parentPleaseUpdate(); } } diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index b50af86..068aabc 100644 --- a/kregexpeditor/selectablelineedit.h +++ b/kregexpeditor/selectablelineedit.h @@ -45,7 +45,7 @@ protected slots: void slotKeyPressed(); signals: - void tqparentPleaseUpdate(); + void parentPleaseUpdate(); private: RegExpWidget* _owner; diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index 2c2707c..dc9cdec 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -28,9 +28,9 @@ SingleContainerWidget::SingleContainerWidget(RegExpEditorWindow* editorWindow, { } -bool SingleContainerWidget::updateSelection( bool tqparentSelected ) +bool SingleContainerWidget::updateSelection( bool parentSelected ) { - bool changed = RegExpWidget::updateSelection( tqparentSelected ); + bool changed = RegExpWidget::updateSelection( parentSelected ); changed = _child->updateSelection( _isSelected ) && changed; if (changed) tqrepaint(); diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h index 7a88a62..9b61ecf 100644 --- a/kregexpeditor/singlecontainerwidget.h +++ b/kregexpeditor/singlecontainerwidget.h @@ -31,7 +31,7 @@ public: SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, const char* name = 0); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual bool hasSelection() const; virtual void clearSelection(); virtual void deleteSelection(); diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 4f5045e..1095749 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -47,7 +47,7 @@ void TextWidget::init( const TQString& txt ) _edit->setText( txt ); - connect( _edit, TQT_SIGNAL( tqparentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); + connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); setFocusProxy( _edit ); _edit->installEventFilter( this ); connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) ); @@ -81,9 +81,9 @@ void TextWidget::selectWidget( bool sel ) _edit->setSelected( sel ); } -bool TextWidget::updateSelection(bool tqparentSelected) +bool TextWidget::updateSelection(bool parentSelected) { - bool changed = RegExpWidget::updateSelection( tqparentSelected ); + bool changed = RegExpWidget::updateSelection( parentSelected ); // I need to call this function all the time, else the rubber band will // not be correctly deleted in the line edit. diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index 973369c..1520808 100644 --- a/kregexpeditor/textwidget.h +++ b/kregexpeditor/textwidget.h @@ -46,7 +46,7 @@ public: protected: void init( const TQString& text ); virtual void paintEvent( TQPaintEvent *e ); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual void clearSelection(); virtual bool eventFilter( TQObject*, TQEvent* ); |