diff options
Diffstat (limited to 'kregexpeditor')
36 files changed, 187 insertions, 187 deletions
diff --git a/kregexpeditor/Comments b/kregexpeditor/Comments index 97cd98e..71f4470 100644 --- a/kregexpeditor/Comments +++ b/kregexpeditor/Comments @@ -1,4 +1,4 @@ (1) If I do not resize the widget to be reparented then it will take up all the size of its new parent, and the parent will never receive a - tqrepaint event, and will thus never get a chance to resize its new child + repaint event, and will thus never get a chance to resize its new child to a proper size (This is namely done in repaintEvent() ). diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp index ff2d6c3..be65d35 100644 --- a/kregexpeditor/KMultiFormListBox/ccp.cpp +++ b/kregexpeditor/KMultiFormListBox/ccp.cpp @@ -38,9 +38,9 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQO void CCP::install(TQObject *elm) { elm->installEventFilter(this); - const TQObjectList tqchildren = elm->childrenListObject(); - if (!tqchildren.isEmpty()) { - TQObjectListIt it = TQObjectListIt(tqchildren); + const TQObjectList children = elm->childrenListObject(); + if (!children.isEmpty()) { + TQObjectListIt it = TQObjectListIt(children); while (TQObject *child=it.current()) { if (child->inherits("KMultiFormListBoxMultiVisible")) { diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp index 905634c..8d3ffe3 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp @@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry() WindowListboxItem *item = selected(); if (item) { int answer = - KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").tqarg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); + KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); if (answer == KMessageBox::Continue) { delete item; slotUpdateButtonState(); diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index e21d2aa..9015aaa 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -48,11 +48,11 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; - // Serializing all the tqchildren (if any). - const TQObjectList tqchildren = from->childrenListObject(); - if ( !tqchildren.isEmpty() ) { - stream << tqchildren.count(); - for ( TQObjectListIt it = TQObjectListIt(tqchildren); *it; ++it ) { + // Serializing all the children (if any). + const TQObjectList children = from->childrenListObject(); + if ( !children.isEmpty() ) { + stream << children.count(); + for ( TQObjectListIt it = TQObjectListIt(children); *it; ++it ) { toStream( *it, stream ); } } @@ -83,14 +83,14 @@ void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to ) if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; - // Stream in all the tqchildren (if any) - const TQObjectList tqchildren = to->childrenListObject(); + // Stream in all the children (if any) + const TQObjectList children = to->childrenListObject(); unsigned int count; stream >> count; - if ( !tqchildren.isEmpty() ) { - Q_ASSERT( count == tqchildren.count() ); - for ( TQObjectListIt it = TQObjectListIt(tqchildren); *it; ++it ) + if ( !children.isEmpty() ) { + Q_ASSERT( count == children.count() ); + for ( TQObjectListIt it = TQObjectListIt(children); *it; ++it ) fromStream( stream, *it ); } else { @@ -147,14 +147,14 @@ KWidgetStreamer::KWidgetStreamer () l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("text") << TQString::fromLatin1("maxLength") - << TQString::fromLatin1("echoMode") << TQString::fromLatin1("tqalignment"); + << TQString::fromLatin1("echoMode") << TQString::fromLatin1("alignment"); _map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l); // TQMultiLineEdit l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("text") - << TQString::fromLatin1("tqalignment"); + << TQString::fromLatin1("alignment"); _map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l); // TQRadioButton diff --git a/kregexpeditor/altnregexp.cpp b/kregexpeditor/altnregexp.cpp index b9b01ec..ef8b8de 100644 --- a/kregexpeditor/altnregexp.cpp +++ b/kregexpeditor/altnregexp.cpp @@ -29,7 +29,7 @@ void AltnRegExp::addRegExp( RegExp *elm ) addChild( elm ); } -RegExpList AltnRegExp::tqchildren() const +RegExpList AltnRegExp::children() const { return list; } diff --git a/kregexpeditor/altnregexp.h b/kregexpeditor/altnregexp.h index 37614f1..c126c5f 100644 --- a/kregexpeditor/altnregexp.h +++ b/kregexpeditor/altnregexp.h @@ -30,7 +30,7 @@ public: AltnRegExp( bool selected ); void addRegExp( RegExp * ); - RegExpList tqchildren() const; + RegExpList children() const; virtual bool check( ErrorMap&, bool first, bool last ); virtual int precedence() const { return 1;} diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index a616310..3a29135 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -34,7 +34,7 @@ AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments - _tqchildren.append(accepter); + _children.append(accepter); _text = i18n("Alternatives"); } @@ -44,10 +44,10 @@ AltnWidget::AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments - _tqchildren.append(accepter); + _children.append(accepter); _text = i18n("Alternatives"); - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { RegExpWidget* child = WidgetFactory::createWidget( *it, editorWindow, this ); ConcWidget* conc; @@ -65,12 +65,12 @@ void AltnWidget::addNewChild(DragAccepter *accepter, RegExpWidget *child) ConcWidget *conc = new ConcWidget(_editorWindow, child,this); MultiContainerWidget::addNewChild( accepter, conc ); updateDrawLineInfo(); - tqrepaint(); + repaint(); } void AltnWidget::setConcChild(ConcWidget *child) { - addNewConcChild( dynamic_cast<DragAccepter*>(_tqchildren.at(0)), child ); + addNewConcChild( dynamic_cast<DragAccepter*>(_children.at(0)), child ); } void AltnWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *child) @@ -83,19 +83,19 @@ void AltnWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *child) TQSize AltnWidget::sizeHint() const { - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); // Skip the first child, as we only need half of the size of the first and the // last drag accepter. Does, however, not apply when there only is onw child. - if ( _tqchildren.count() != 1 ) + if ( _children.count() != 1 ) ++it; - _tqchildrenWidth = 0; - _tqchildrenHeight = 0; + _childrenWidth = 0; + _childrenHeight = 0; for ( ; *it ; ++it) { TQSize thisChildSize = (*it)->sizeHint(); - _tqchildrenWidth = TQMAX(_tqchildrenWidth, thisChildSize.width()); - _tqchildrenHeight += thisChildSize.height(); + _childrenWidth = TQMAX(_childrenWidth, thisChildSize.width()); + _childrenHeight += thisChildSize.height(); } // Now add the size of the header @@ -104,18 +104,18 @@ TQSize AltnWidget::sizeHint() const int headerWidth = _textSize.width() + 2 * bdSize + 2; - _tqchildrenWidth = TQMAX(_tqchildrenWidth, headerWidth); + _childrenWidth = TQMAX(_childrenWidth, headerWidth); - return TQSize(_tqchildrenWidth + 2*pw, _tqchildrenHeight + _textSize.height() + 1*pw ); + return TQSize(_childrenWidth + 2*pw, _childrenHeight + _textSize.height() + 1*pw ); } void AltnWidget::paintEvent( TQPaintEvent *e) { - Q_ASSERT( dynamic_cast<DragAccepter*>(_tqchildren.at(0)) ); + Q_ASSERT( dynamic_cast<DragAccepter*>(_children.at(0)) ); // if this fails, then I should check the location of the show() - Q_ASSERT( _tqchildren.count() == 1 || - ( _tqchildren.count() >=3 && - dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)) ) ); + Q_ASSERT( _children.count() == 1 || + ( _children.count() >=3 && + dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)) ) ); int offset = 0; TQSize mySize = sizeHint(); @@ -136,13 +136,13 @@ void AltnWidget::paintEvent( TQPaintEvent *e) painter.drawLine(mySize.width()-pw, startY, mySize.width()-pw, mySize.height()); painter.drawLine(0,mySize.height()-pw, mySize.width()-pw, mySize.height()-pw); - //---- Run through all the tqchildren and place them at the correct location. + //---- Run through all the children and place them at the correct location. offset = _textSize.height(); xOffset = pw; - for (unsigned int i = 0; i < _tqchildren.count(); i++ ) { + for (unsigned int i = 0; i < _children.count(); i++ ) { - RegExpWidget* child = _tqchildren.at(i); + RegExpWidget* child = _children.at(i); TQSize childSize = child->sizeHint(); TQSize curChildSize = child->size(); @@ -151,12 +151,12 @@ void AltnWidget::paintEvent( TQPaintEvent *e) int x = xOffset; int y = offset; int h = childSize.height(); - if ( ( _tqchildren.count() != 1 ) && ( i == 0 || i == _tqchildren.count() -1 ) ) { + if ( ( _children.count() != 1 ) && ( i == 0 || i == _children.count() -1 ) ) { // first and last DragAccepter should only be half size. h /= 2; } - int w = _tqchildrenWidth; + int w = _childrenWidth; child->setGeometry( x, y, w, h ); if ( w != curChildSize.width() || h != curChildSize.height() ) { // I resized the child, so give it a chance to relect thus. @@ -172,7 +172,7 @@ RegExp* AltnWidget::regExp() const { AltnRegExp *regexp = new AltnRegExp( isSelected() ); - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // start with the second element for ( ; *it; it+=2 ) { regexp->addRegExp( (*it)->regExp() ); @@ -183,8 +183,8 @@ RegExp* AltnWidget::regExp() const void AltnWidget::applyRegExpToSelection( RegExpType type ) { - for ( unsigned int i=1; i < _tqchildren.count(); i += 2 ) { - RegExpWidget* child = _tqchildren.at( i ); + for ( unsigned int i=1; i < _children.count(); i += 2 ) { + RegExpWidget* child = _children.at( i ); if ( child->hasSelection() ) { child->applyRegExpToSelection( type ); } @@ -197,7 +197,7 @@ RegExp* AltnWidget::selection() const if ( isSelected() ) return regExp(); else { - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past DragAccepter for ( ; *it; it+=2 ) { if ( (*it)->hasSelection() ) { @@ -216,7 +216,7 @@ bool AltnWidget::validateSelection() const } bool foundASelection = false; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past DragAccepter for ( ; *it; it+=2 ) { if ( (*it)->hasSelection() ) { @@ -238,9 +238,9 @@ bool AltnWidget::validateSelection() const void AltnWidget::updateDrawLineInfo() { - for ( unsigned int i=0; i < _tqchildren.count(); i+=2 ) { - bool line = ( i != 0 && i!= _tqchildren.count()-1 ); - DragAccepter *accepter = dynamic_cast<DragAccepter*>(_tqchildren.at(i)); + for ( unsigned int i=0; i < _children.count(); i+=2 ) { + bool line = ( i != 0 && i!= _children.count()-1 ); + DragAccepter *accepter = dynamic_cast<DragAccepter*>(_children.at(i)); if (accepter) accepter->setDrawLine( line ); } diff --git a/kregexpeditor/altnwidget.h b/kregexpeditor/altnwidget.h index 8404712..589726d 100644 --- a/kregexpeditor/altnwidget.h +++ b/kregexpeditor/altnwidget.h @@ -58,8 +58,8 @@ private: mutable TQSize _textSize; mutable int _maxSelectedWidth; - mutable int _tqchildrenWidth; - mutable int _tqchildrenHeight; + mutable int _childrenWidth; + mutable int _childrenHeight; }; #endif // altnwidget diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index 044ec85..cf133dd 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -247,7 +247,7 @@ void CompoundWidget::slotConfigCanceled() TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; streamer.fromStream( stream, TQT_TQOBJECT(_content) ); - tqrepaint(); + repaint(); } RegExp* CompoundWidget::regExp() const @@ -273,7 +273,7 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) { _hidden = !_hidden; _editorWindow->updateContent( 0 ); - tqrepaint(); // is this necesary? + repaint(); // is this necesary? _editorWindow->emitChange(); } else @@ -286,7 +286,7 @@ bool CompoundWidget::updateSelection( bool parentSelected ) bool changed = RegExpWidget::updateSelection( parentSelected ); _child->selectWidget( _isSelected ); if (changed) - tqrepaint(); + repaint(); return changed; } else { diff --git a/kregexpeditor/concregexp.cpp b/kregexpeditor/concregexp.cpp index 1c8421d..cefbac4 100644 --- a/kregexpeditor/concregexp.cpp +++ b/kregexpeditor/concregexp.cpp @@ -29,7 +29,7 @@ void ConcRegExp::addRegExp( RegExp *regExp ) addChild( regExp ); } -RegExpList ConcRegExp::tqchildren() +RegExpList ConcRegExp::children() { return list; } diff --git a/kregexpeditor/concregexp.h b/kregexpeditor/concregexp.h index 15a0a66..47e3b26 100644 --- a/kregexpeditor/concregexp.h +++ b/kregexpeditor/concregexp.h @@ -31,7 +31,7 @@ public: ConcRegExp( bool selected ); void addRegExp( RegExp *); - RegExpList tqchildren(); + RegExpList children(); RegExp* lastRegExp(); virtual bool check( ErrorMap&, bool first, bool last ); diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index 53f7f1d..8cbff9e 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -28,7 +28,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->show(); - _tqchildren.append(accepter); + _children.append(accepter); } @@ -38,7 +38,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); - _tqchildren.append(accepter); + _children.append(accepter); child->reparent(this, TQPoint(0,0), false); addNewChild(accepter, child); } @@ -48,13 +48,13 @@ ConcWidget::ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, :MultiContainerWidget(editorWindow, 0, "Splitted ConcWidget") { init(); - _tqchildren.prepend( new DragAccepter(editorWindow, this) ); + _children.prepend( new DragAccepter(editorWindow, this) ); for (unsigned int i = end; i >= start; i--) { - RegExpWidget* child = origConc->_tqchildren.take( i ); - _tqchildren.prepend( child ); + RegExpWidget* child = origConc->_children.take( i ); + _children.prepend( child ); child->reparent( this, TQPoint(0,0), false); } - _tqchildren.prepend( new DragAccepter(editorWindow, this) ); + _children.prepend( new DragAccepter(editorWindow, this) ); } ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, @@ -63,9 +63,9 @@ ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); - _tqchildren.append(accepter); + _children.append(accepter); - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { RegExpWidget* child = WidgetFactory::createWidget( *it, editorWindow, this ); append( child ); @@ -80,30 +80,30 @@ void ConcWidget::init() TQSize ConcWidget::sizeHint() const { - int tqchildrenWidth = 0; - int tqchildrenHeight = 0; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + int childrenWidth = 0; + int childrenHeight = 0; + TQPtrListIterator<RegExpWidget> it(_children); for ( ; *it; ++it) { TQSize thisChildSize = (*it)->sizeHint(); - tqchildrenWidth += thisChildSize.width(); - tqchildrenHeight = TQMAX(tqchildrenHeight, thisChildSize.height()); + childrenWidth += thisChildSize.width(); + childrenHeight = TQMAX(childrenHeight, thisChildSize.height()); } - return TQSize(tqchildrenWidth, tqchildrenHeight); + return TQSize(childrenWidth, childrenHeight); } void ConcWidget::paintEvent( TQPaintEvent *e) { - Q_ASSERT( dynamic_cast<DragAccepter*>(_tqchildren.at(0)) ); + Q_ASSERT( dynamic_cast<DragAccepter*>(_children.at(0)) ); // if this fails, then I should check the location of the show() - Q_ASSERT( _tqchildren.count() == 1 || - ( _tqchildren.count() >=3 && - dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)) ) ); + Q_ASSERT( _children.count() == 1 || + ( _children.count() >=3 && + dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)) ) ); - if ( _tqchildren.count() == 1) { + if ( _children.count() == 1) { // There is only an accepter, lets give it all the space. - _tqchildren.at(0)->setGeometry( 0, 0, size().width(), size().height() ); + _children.at(0)->setGeometry( 0, 0, size().width(), size().height() ); } else { TQSize myReqSize = sizeHint(); @@ -125,11 +125,11 @@ void ConcWidget::paintEvent( TQPaintEvent *e) int lastHeight = 0; int offset = 0; - for (unsigned int i = 1; i < _tqchildren.count(); i += 2 ) { - DragAccepter* accepter = dynamic_cast<DragAccepter*>(_tqchildren.at(i-1)); + for (unsigned int i = 1; i < _children.count(); i += 2 ) { + DragAccepter* accepter = dynamic_cast<DragAccepter*>(_children.at(i-1)); if (!accepter) continue; - RegExpWidget* child = _tqchildren.at(i); + RegExpWidget* child = _children.at(i); TQSize childSize = child->sizeHint(); TQSize curChildSize = child->size(); @@ -176,7 +176,7 @@ void ConcWidget::paintEvent( TQPaintEvent *e) //---------------------- Finally place the last accepter. DragAccepter* accepter = - dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)); + dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)); // dynamic_cast is ASSERTed at top int x = offset; int h = lastHeight; @@ -212,10 +212,10 @@ void ConcWidget::sizeAccepter( DragAccepter* accepter, int height, int totHeight RegExp* ConcWidget::regExp() const { - TQPtrListIterator<RegExpWidget> it( _tqchildren ); + TQPtrListIterator<RegExpWidget> it( _children ); ++it; // start with the second element. - if ( _tqchildren.count() == 3 ) { + if ( _children.count() == 3 ) { // Exactly one child (and two drag accepters) return (*it)->regExp(); } @@ -236,7 +236,7 @@ bool ConcWidget::updateSelection(bool parentSelected) _maxSelectedHeight = 0; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past the first DragAccepter for ( ; *it; it +=2 ) { if ( (*it)->isSelected() ) { @@ -246,7 +246,7 @@ bool ConcWidget::updateSelection(bool parentSelected) changed = changed || isSel != _isSelected; if ( changed ) { - tqrepaint(); + repaint(); } return changed; @@ -259,8 +259,8 @@ void ConcWidget::getSelectionIndexes( int* start, int* end ) // Start with element at index 1, and skip every second element, as we // know they are dragAccepters. - for ( unsigned int index = 1; index< _tqchildren.count(); index += 2 ) { - RegExpWidget* child = _tqchildren.at(index); + for ( unsigned int index = 1; index< _children.count(); index += 2 ) { + RegExpWidget* child = _children.at(index); if ( child->isSelected() ) { // The child is selected at topmost level. @@ -276,7 +276,7 @@ void ConcWidget::getSelectionIndexes( int* start, int* end ) } if ( *start != -1 && *end == -1 ) - *end = _tqchildren.count() -2; + *end = _children.count() -2; } void ConcWidget::applyRegExpToSelection( RegExpType type ) @@ -287,7 +287,7 @@ void ConcWidget::applyRegExpToSelection( RegExpType type ) if ( start == -1 ) { // No item selected at top level - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past the first DragAccepter for ( ; *it ; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -307,7 +307,7 @@ void ConcWidget::applyRegExpToSelection( RegExpType type ) subSequence->resize(0,0); // see note (1) subSequence->reparent( newElm, TQPoint(0,0), false); - _tqchildren.insert( start, newElm ); + _children.insert( start, newElm ); newElm->show(); } } @@ -318,7 +318,7 @@ bool ConcWidget::isSelected() const // A ConcWidget should be considered selected when all its elements has been selected // otherwise empty ConcWidgets may be left behind when for example selection is deleted. bool allSelected = true; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past first DragAccepter. for ( ; *it && allSelected; it += 2 ) { allSelected = allSelected && (*it)->isSelected(); @@ -336,7 +336,7 @@ RegExp* ConcWidget::selection() const bool foundMoreThanOne = false; RegExp* regexp = 0; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Skip past the first DragAccepter for ( ; (*it) ; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -363,21 +363,21 @@ RegExp* ConcWidget::selection() const void ConcWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *other) { - for ( unsigned int i=0; i<_tqchildren.count(); i+= 2 ) { - RegExpWidget *ch = _tqchildren.at( i ); + for ( unsigned int i=0; i<_children.count(); i+= 2 ) { + RegExpWidget *ch = _children.at( i ); if ( ch == accepter ) { // Move all the element from the `child' ConcWidget to this one. // Do not copy the first one as this is a dragAccepter, and we place the widgets // after this drag accepter. // We must take them in pairs to avoid breaking the invariant for paintEvent, // namely that every second element is a dragAccepter - for ( unsigned int j = other->_tqchildren.count()-1; j > 0 ; j-=2 ) { - RegExpWidget* newChildA = other->_tqchildren.take(j); + for ( unsigned int j = other->_children.count()-1; j > 0 ; j-=2 ) { + RegExpWidget* newChildA = other->_children.take(j); newChildA->reparent( this, TQPoint(0,0), false); - _tqchildren.insert( i+1, newChildA ); - RegExpWidget* newChildB = other->_tqchildren.take(j-1); + _children.insert( i+1, newChildA ); + RegExpWidget* newChildB = other->_children.take(j-1); newChildB->reparent( this, TQPoint(0,0), false); - _tqchildren.insert( i+1, newChildB ); + _children.insert( i+1, newChildB ); newChildA->show(); newChildB->show(); } @@ -391,7 +391,7 @@ void ConcWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *other) bool ConcWidget::validateSelection() const { bool cont = true; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // skip past the DragAccepter. for ( ; *it && cont; it += 2 ) { cont = (*it)->validateSelection(); diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index b5dbf48..9a4820c 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -52,7 +52,7 @@ public: virtual bool validateSelection() const; virtual bool acceptWidgetInsert( RegExpType ) const { return false; } virtual bool acceptWidgetPaste() const { return false; } - bool hasAnyChildren() { return _tqchildren.count() > 1; } + bool hasAnyChildren() { return _children.count() > 1; } protected: virtual void paintEvent( TQPaintEvent *e ); diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index a21cb21..6f7173f 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -209,8 +209,8 @@ void RegExpEditorWindow::slotDoSelect() _pasteInAction = false; _insertInAction = false; - // I need to update the cursor recursively, as a tqrepaint may not have been issued yet - // when this method is invoked. This means that when the tqrepaint comes, the cursor may + // I need to update the cursor recursively, as a repaint may not have been issued yet + // when this method is invoked. This means that when the repaint comes, the cursor may // move to an other widget. _top->updateCursorRecursively(); } @@ -383,14 +383,14 @@ void RegExpEditorWindow::slotSave() TQString fileName = dir + TQString::fromLocal8Bit("/") + txt + TQString::fromLocal8Bit(".regexp"); TQFileInfo finfo( fileName ); if ( finfo.exists() ) { - int answer = KMessageBox::warningContinueCancel( this, i18n("<p>Overwrite named regular expression <b>%1</b></p>").tqarg(txt), TQString(), i18n("Overwrite")); + int answer = KMessageBox::warningContinueCancel( this, i18n("<p>Overwrite named regular expression <b>%1</b></p>").arg(txt), TQString(), i18n("Overwrite")); if ( answer != KMessageBox::Continue ) return; } TQFile file( fileName ); if ( ! file.open(IO_WriteOnly) ) { - KMessageBox::sorry( this, i18n("Could not open file for writing: %1").tqarg(fileName) ); + KMessageBox::sorry( this, i18n("Could not open file for writing: %1").arg(fileName) ); return; } diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp index 5cfa54d..491e989 100644 --- a/kregexpeditor/emacsregexpconverter.cpp +++ b/kregexpeditor/emacsregexpconverter.cpp @@ -40,7 +40,7 @@ TQString EmacsRegExpConverter::toString( AltnRegExp* regexp, bool markSelection TQString res; bool first = true; - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { if ( !first ) { res += TQString::fromLatin1("\\|"); @@ -56,7 +56,7 @@ TQString EmacsRegExpConverter::toString( ConcRegExp* regexp, bool markSelection { TQString res; - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { TQString startPar = TQString::fromLocal8Bit(""); TQString endPar = TQString::fromLocal8Bit(""); diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc index 9a842b6..f2ac58a 100644 --- a/kregexpeditor/gen_qregexpparser.cc +++ b/kregexpeditor/gen_qregexpparser.cc @@ -1160,7 +1160,7 @@ yyreduce: case 23: #line 157 "qregexpparser.y" { - TQString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( yyvsp[0].backRef ); + TQString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( yyvsp[0].backRef ); yyval.regexp = new TextRegExp( false, match ); KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>" "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to " @@ -1170,7 +1170,7 @@ yyreduce: "just a workaround to ensure that the application handles the regexp at all. " "Therefore, as soon as you edit the regular expression in the graphical area, " "the back reference will be replaced by matching the text <b>%2</b> literally.") - .tqarg( match ).tqarg( match ), + .arg( match ).arg( match ), i18n("Back reference regular expressions not supported"), TQString::fromLocal8Bit("backReferenceNotSupported") ); } @@ -1192,13 +1192,13 @@ yyreduce: if ( yyvsp[0].ch == '{' || yyvsp[0].ch == '}' || yyvsp[0].ch == '[' || yyvsp[0].ch == ']' || yyvsp[0].ch == '\\' ) { yyerror( "illigal character - needs escaping" ); } - yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); + yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg(yyvsp[0].ch)); } break; case 27: #line 182 "qregexpparser.y" - { yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); } + { yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg(yyvsp[0].ch)); } break; diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index 1a2e371..6208dc6 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -130,7 +130,7 @@ void KRegExpEditorGUI::doSomething( TQString method, void* arguments ) _editor->setAllowNonTQtSyntax( (bool) arguments ); } else { - qFatal( "%s", tqtr("Method '%1' is not valid!").tqarg(method).latin1() ); + qFatal( "%s", tqtr("Method '%1' is not valid!").arg(method).latin1() ); } } diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index c74531e..e34e20c 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -371,7 +371,7 @@ void KRegExpEditorPrivate::setVerifyText( const TQString& fileName ) _autoVerify = false; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::sorry(0, i18n("Could not open file '%1' for reading").tqarg( fileName ) ); + KMessageBox::sorry(0, i18n("Could not open file '%1' for reading").arg( fileName ) ); } else { TQTextStream s( &file ); diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index 7f72e04..bd578d2 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -27,8 +27,8 @@ MultiContainerWidget::MultiContainerWidget( RegExpEditorWindow* editorWindow, void MultiContainerWidget::append( RegExpWidget* child ) { child->reparent( this, TQPoint(0,0), false ); - _tqchildren.append( child ); - _tqchildren.append( new DragAccepter( _editorWindow, this ) ); + _children.append( child ); + _children.append( new DragAccepter( _editorWindow, this ) ); } bool MultiContainerWidget::hasSelection() const @@ -36,7 +36,7 @@ bool MultiContainerWidget::hasSelection() const if ( _isSelected ) return true; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Move past the first dragAccepter for ( ; *it; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -49,8 +49,8 @@ bool MultiContainerWidget::hasSelection() const void MultiContainerWidget::clearSelection() { _isSelected = false; - for ( unsigned int i = 0; i< _tqchildren.count(); i++ ) { - _tqchildren.at(i)->clearSelection(); + for ( unsigned int i = 0; i< _children.count(); i++ ) { + _children.at(i)->clearSelection(); } } @@ -58,15 +58,15 @@ void MultiContainerWidget::clearSelection() void MultiContainerWidget::deleteSelection() { // run from the back to the front (which we do since we delete items on the run) - // When deleting tqchildren, delete the drag accepter to its right. - for ( int i = (int) _tqchildren.count()-2; i > 0; i -=2 ) { + // When deleting children, delete the drag accepter to its right. + for ( int i = (int) _children.count()-2; i > 0; i -=2 ) { - RegExpWidget* child = _tqchildren.at( i ); + RegExpWidget* child = _children.at( i ); if ( child->isSelected() ) { - delete _tqchildren.at( i+1 ); - _tqchildren.remove( i+1 ); + delete _children.at( i+1 ); + _children.remove( i+1 ); delete child; - _tqchildren.remove(i); + _children.remove(i); } else if ( child->hasSelection() ) { child->deleteSelection(); @@ -78,16 +78,16 @@ void MultiContainerWidget::deleteSelection() void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *child) { - for ( unsigned int i=0; i<_tqchildren.count(); i+= 2 ) { - RegExpWidget *ch = _tqchildren.at( i ); + for ( unsigned int i=0; i<_children.count(); i+= 2 ) { + RegExpWidget *ch = _children.at( i ); if ( ch == accepter ) { // Insert the new child - _tqchildren.insert( i+1, child ); + _children.insert( i+1, child ); // Insert an accepter as the next element. DragAccepter *accepter = new DragAccepter( _editorWindow, this ); - _tqchildren.insert( i+2, accepter ); + _children.insert( i+2, accepter ); // These two show's must come here otherwise a paintevent // will be invoked, where the invariant, that a accepter is located at @@ -107,11 +107,11 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) { bool changed = false; bool isSel = _isSelected; - TQMemArray<bool> oldState(_tqchildren.count()); - TQMemArray<bool> newState(_tqchildren.count()); + TQMemArray<bool> oldState(_children.count()); + TQMemArray<bool> newState(_children.count()); - for (int i = 0; i< (int)_tqchildren.count();i++) { - oldState[i] = _tqchildren.at(i)->isSelected(); + for (int i = 0; i< (int)_children.count();i++) { + oldState[i] = _children.at(i)->isSelected(); } RegExpWidget::updateSelection( parentSelected ); @@ -120,8 +120,8 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) int last; // scan for the first selected item. - for (first = 1; first < (int) _tqchildren.count(); first+= 2 ) { - RegExpWidget* child = _tqchildren.at(first); + for (first = 1; first < (int) _children.count(); first+= 2 ) { + RegExpWidget* child = _children.at(first); changed = child->updateSelection( _isSelected ) || changed; newState[first] = child->isSelected(); if ( child->isSelected() ) @@ -129,8 +129,8 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) } // scan for the last selected item - for (last = _tqchildren.count()-2; last>first; last -= 2) { - RegExpWidget* child = _tqchildren.at(last); + for (last = _children.count()-2; last>first; last -= 2) { + RegExpWidget* child = _children.at(last); changed = child->updateSelection( _isSelected ) || changed; newState[last] = child->isSelected(); if ( child->isSelected() ) @@ -139,17 +139,17 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) // everything between first and last must be selected. for (int j = first+2; j<last; j+=2) { - RegExpWidget* child = _tqchildren.at(j); + RegExpWidget* child = _children.at(j); changed = child->updateSelection( true ) || changed; newState[j] = true; } // update drag accepters. - for (int k = 0; k< (int) _tqchildren.count(); k+=2) { - RegExpWidget* child = _tqchildren.at(k); + for (int k = 0; k< (int) _children.count(); k+=2) { + RegExpWidget* child = _children.at(k); bool select; - if ( k == 0 || k == (int)_tqchildren.count()-1) { + if ( k == 0 || k == (int)_children.count()-1) { // The elements at the border is only selected if the parent is selected. select = _isSelected; } @@ -164,12 +164,12 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) if (accepter) accepter->_isSelected = select; if ( select != isChildSel ) - child->tqrepaint(); + child->repaint(); } changed = changed || isSel != _isSelected; if ( changed ) { - tqrepaint(); + repaint(); } return changed; @@ -183,7 +183,7 @@ TQRect MultiContainerWidget::selectionRect() const return TQRect( mapToGlobal( TQPoint(0,0) ), size() ); else { TQRect res; - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); ++it; // Move past the first dragAccepter for ( ; *it; it +=2 ) { if ( (*it)->hasSelection() ) { @@ -216,8 +216,8 @@ RegExpWidget* MultiContainerWidget::widgetUnderPoint( TQPoint globalPos, bool ju incr = 1; } - for ( unsigned int i = start; i < _tqchildren.count(); i+=incr ) { - RegExpWidget* wid = _tqchildren.at(i)->widgetUnderPoint( globalPos, justVisibleWidgets ); + for ( unsigned int i = start; i < _children.count(); i+=incr ) { + RegExpWidget* wid = _children.at(i)->widgetUnderPoint( globalPos, justVisibleWidgets ); if ( wid ) return wid; } @@ -230,8 +230,8 @@ RegExpWidget* MultiContainerWidget::widgetUnderPoint( TQPoint globalPos, bool ju RegExpWidget* MultiContainerWidget::findWidgetToEdit( TQPoint globalPos ) { - for ( unsigned int i = 1; i < _tqchildren.count(); i+=2 ) { - RegExpWidget* wid = _tqchildren.at(i)->findWidgetToEdit( globalPos ); + for ( unsigned int i = 1; i < _children.count(); i+=2 ) { + RegExpWidget* wid = _children.at(i)->findWidgetToEdit( globalPos ); if ( wid ) return wid; } @@ -241,7 +241,7 @@ RegExpWidget* MultiContainerWidget::findWidgetToEdit( TQPoint globalPos ) void MultiContainerWidget::selectWidget( bool sel ) { RegExpWidget::selectWidget( sel ); - TQPtrListIterator<RegExpWidget> it(_tqchildren); + TQPtrListIterator<RegExpWidget> it(_children); for ( ; *it ; ++it ) { (*it)->selectWidget( sel ); } @@ -250,7 +250,7 @@ void MultiContainerWidget::selectWidget( bool sel ) void MultiContainerWidget::updateAll() { - for ( TQPtrListIterator<RegExpWidget> it(_tqchildren); *it ; ++it ) { + for ( TQPtrListIterator<RegExpWidget> it(_children); *it ; ++it ) { (*it)->updateAll(); } RegExpWidget::updateAll(); @@ -258,7 +258,7 @@ void MultiContainerWidget::updateAll() void MultiContainerWidget::updateCursorRecursively() { - for ( TQPtrListIterator<RegExpWidget> it(_tqchildren); *it ; ++it ) { + for ( TQPtrListIterator<RegExpWidget> it(_children); *it ; ++it ) { (*it)->updateCursorRecursively(); } updateCursorShape(); diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 560baa0..4dd6a58 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -21,7 +21,7 @@ #include "regexpwidget.h" /** - Abstract RegExp widget class representing widgets having multible tqchildren. + Abstract RegExp widget class representing widgets having multible children. @internal */ class MultiContainerWidget :public RegExpWidget @@ -43,7 +43,7 @@ public: protected: void append( RegExpWidget* child ); - TQPtrList<RegExpWidget> _tqchildren; + TQPtrList<RegExpWidget> _children; }; diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y index 75eeaa2..080dc2c 100644 --- a/kregexpeditor/qregexpparser.y +++ b/kregexpeditor/qregexpparser.y @@ -155,7 +155,7 @@ atom : TOK_LeftParen expression TOK_RightParent { | TOK_Carat { $<regexp>$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); } | TOK_Dot { $<regexp>$ = new DotRegExp( false ); } | TOK_BackRef { - QString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( $<backRef>1 ); + QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 ); $<regexp>$ = new TextRegExp( false, match ); KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>" "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to " @@ -165,7 +165,7 @@ atom : TOK_LeftParen expression TOK_RightParent { "just a workaround to ensure that the application handles the regexp at all. " "Therefore, as soon as you edit the regular expression in the graphical area, " "the back reference will be replaced by matching the text <b>%2</b> literally.") - .tqarg( match ).tqarg( match ), + .arg( match ).arg( match ), i18n("Back reference regular expressions not supported"), QString::fromLocal8Bit("backReferenceNotSupported") ); } @@ -177,9 +177,9 @@ char : TOK_Char { if ( $<ch>1 == '{' || $<ch>1 == '}' || $<ch>1 == '[' || $<ch>1 == ']' || $<ch>1 == '\\' ) { yyerror( "illigal character - needs escaping" ); } - $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($<ch>1)); + $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($<ch>1)); } - | TOK_EscapeChar { $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($<ch>1)); } + | TOK_EscapeChar { $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($<ch>1)); } ; %% diff --git a/kregexpeditor/qtregexpconverter.cpp b/kregexpeditor/qtregexpconverter.cpp index ab37244..c63550b 100644 --- a/kregexpeditor/qtregexpconverter.cpp +++ b/kregexpeditor/qtregexpconverter.cpp @@ -48,7 +48,7 @@ TQString TQtRegExpConverter::toString( AltnRegExp* regexp, bool markSelection ) TQString res; bool first = true; - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { if ( !first ) { res += TQString::fromLatin1( "|" ); @@ -69,7 +69,7 @@ TQString TQtRegExpConverter::toString( ConcRegExp* regexp, bool markSelection ) TQString res; bool childSelected = false; - RegExpList list = regexp->tqchildren(); + RegExpList list = regexp->children(); for ( RegExpListIt it(list); *it; ++it ) { TQString startPar = TQString::fromLocal8Bit(""); TQString endPar = TQString::fromLocal8Bit(""); diff --git a/kregexpeditor/regexp.cpp b/kregexpeditor/regexp.cpp index 11a8788..0b583d7 100644 --- a/kregexpeditor/regexp.cpp +++ b/kregexpeditor/regexp.cpp @@ -28,7 +28,7 @@ RegExp::RegExp( bool selected ) : _parent(0), _destructing( false ), _selected( RegExp::~RegExp() { _destructing = true; - for ( TQPtrListIterator<RegExp> it(_tqchildren); *it; ++it ) { + for ( TQPtrListIterator<RegExp> it(_children); *it; ++it ) { delete *it; } if ( _parent ) @@ -38,14 +38,14 @@ RegExp::~RegExp() void RegExp::addChild( RegExp* child ) { - _tqchildren.append( child ); + _children.append( child ); child->setParent( this ); } void RegExp::removeChild( RegExp* child ) { if ( ! _destructing ) { - _tqchildren.remove( child ); + _children.remove( child ); } } diff --git a/kregexpeditor/regexp.h b/kregexpeditor/regexp.h index 9e0b384..5b2bcae 100644 --- a/kregexpeditor/regexp.h +++ b/kregexpeditor/regexp.h @@ -59,7 +59,7 @@ protected: private: RegExp() {} // disable - TQPtrList<RegExp> _tqchildren; + TQPtrList<RegExp> _children; RegExp* _parent; bool _destructing; bool _selected; diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index d6179b4..231848f 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -43,17 +43,17 @@ RegExpWidget::RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, void RegExpWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("This widget should not expect any tqchildren"); + qFatal("This widget should not expect any children"); } void RegExpWidget::addNewConcChild(DragAccepter *, ConcWidget *) { - qFatal("This widget should not expect any tqchildren"); + qFatal("This widget should not expect any children"); } void RegExpWidget::setConcChild(ConcWidget *) { - qFatal("This widget should not expect any tqchildren"); + qFatal("This widget should not expect any children"); } bool RegExpWidget::updateSelection(bool parentSelected) @@ -65,7 +65,7 @@ bool RegExpWidget::updateSelection(bool parentSelected) if ( _isSelected != selected ) { // Selection state changed _isSelected = selected; - tqrepaint(); + repaint(); return true; } return false; diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 699f13f..d9480e9 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -49,7 +49,7 @@ public: virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); /** - Inserts all the tqchildren of `child' into this widget in place of + Inserts all the children of `child' into this widget in place of `accepter'. This method only applies to container widgets (see @ref SingleContainerWidget, and @ref MultiContainerWidget). @@ -83,7 +83,7 @@ public: virtual bool isSelected() const; /** - Returns true if this widget or one of its tqchildren is selected. + Returns true if this widget or one of its children is selected. */ virtual bool hasSelection() const; @@ -93,7 +93,7 @@ public: Update selection information for this widget. @param parentSelected indicates whether the parent 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 + the last time the widget was painted. `repaint' is invoked on the widget if selection state is changed, to ensure that selection is visible. */ virtual bool updateSelection(bool parentSelected); diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp index 6b855f2..92b5ac8 100644 --- a/kregexpeditor/repeatregexp.cpp +++ b/kregexpeditor/repeatregexp.cpp @@ -58,7 +58,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version ) if ( !ok ) { KMessageBox::sorry( 0, i18n("<p>Value for attribute <b>%1</b> was not an integer for element " "<b>%2</b></p><p>It contained the value <b>%3</b></p>") - .tqarg(TQString::fromLatin1("lower")).tqarg(TQString::fromLatin1("Repeat")).tqarg(lower), + .arg(TQString::fromLatin1("lower")).arg(TQString::fromLatin1("Repeat")).arg(lower), i18n("Error While Loading From XML File") ) ; _lower = 0; } @@ -66,7 +66,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version ) if ( !ok ) { KMessageBox::sorry( 0, i18n("<p>Value for attribute <b>%1</b> was not an integer for element " "<b>%2</b></p><p>It contained the value <b>%3</b></p>") - .tqarg(TQString::fromLatin1("upper")).tqarg(TQString::fromLatin1("Repeat")).tqarg(upper), + .arg(TQString::fromLatin1("upper")).arg(TQString::fromLatin1("Repeat")).arg(upper), i18n("Error While Loading From XML File") ) ; _upper = -1; } diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index 0d086c7..9536679 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -152,7 +152,7 @@ void RepeatWidget::slotConfigCanceled() TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; streamer.fromStream( stream, TQT_TQOBJECT(_content) ); - tqrepaint(); + repaint(); } int RepeatWidget::edit() @@ -271,7 +271,7 @@ TQString RepeatRangeWindow::text() case ATMOST: return i18n("Repeated at Most 1 Time", "Repeated at Most %n Times", _mostTimes->value() ); case EXACTLY: return i18n("Repeated Exactly 1 Time", "Repeated Exactly %n Times", _exactlyTimes->value() ); case MINMAX: return i18n("Repeated From %1 to %2 Times") - .tqarg( _rangeFrom->value() ).tqarg( _rangeTo->value() ); + .arg( _rangeFrom->value() ).arg( _rangeTo->value() ); } qFatal("Fall through!"); return TQString::fromLocal8Bit(""); diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index 25f0a00..dda0a9b 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -40,7 +40,7 @@ void SelectableLineEdit::setSelected( bool selected ) else { unsetPalette(); } - tqrepaint(); + repaint(); } TQSize SelectableLineEdit::sizeHint() const @@ -67,7 +67,7 @@ void SelectableLineEdit::slotKeyPressed() int actualSize = metrics.width( text() ); if ( actualSize > size().width()-frameWidth ) { - tqrepaint(); + repaint(); emit parentPleaseUpdate(); } } diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index 27035af..52ee1fe 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -33,7 +33,7 @@ bool SingleContainerWidget::updateSelection( bool parentSelected ) bool changed = RegExpWidget::updateSelection( parentSelected ); changed = _child->updateSelection( _isSelected ) && changed; if (changed) - tqrepaint(); + repaint(); return changed; } diff --git a/kregexpeditor/textrangeregexp.cpp b/kregexpeditor/textrangeregexp.cpp index 78c2696..0a92073 100644 --- a/kregexpeditor/textrangeregexp.cpp +++ b/kregexpeditor/textrangeregexp.cpp @@ -127,7 +127,7 @@ bool TextRangeRegExp::load( TQDomElement top, const TQString& /*version*/ ) addRange( from, to ); } else { - KMessageBox::sorry( 0, i18n("<p>Invalid sub element to element <b>TextRange</b>. Tag was <b>%1</b></p>").tqarg(child.tagName()), + KMessageBox::sorry( 0, i18n("<p>Invalid sub element to element <b>TextRange</b>. Tag was <b>%1</b></p>").arg(child.tagName()), i18n("Error While Loading From XML File") ) ; return false; } diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 9c58e66..5de0dee 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -56,13 +56,13 @@ void TextWidget::init( const TQString& txt ) void TextWidget::slotUpdate() { - // I need to force the parent to tqrepaint, as the size change of this + // I need to force the parent to repaint, as the size change of this // widget may not be enough for the parent to change size, and in that - // case the parent would not tqrepaint, and the text widget would not be + // case the parent would not repaint, and the text widget would not be // resized. TQWidget *p = TQT_TQWIDGET(parent()); if (p) - p->tqrepaint(); + p->repaint(); _editorWindow->updateContent( this ); } diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index 385ea69..89e0bb1 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -101,7 +101,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di TQFile file( fileName ); if ( ! file.open(IO_ReadOnly) ) { - KMessageBox::sorry( this, i18n("Could not open file for reading: %1").tqarg(fileName) ); + KMessageBox::sorry( this, i18n("Could not open file for reading: %1").arg(fileName) ); continue; } @@ -111,7 +111,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di RegExp* regexp = WidgetFactory::createRegExp( data ); if ( ! regexp ) { - KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").tqarg( fileName ) ); + KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").arg( fileName ) ); continue; } @@ -200,7 +200,7 @@ void UserDefinedRegExps::slotEdit( TQListViewItem* item, const TQPoint& pos ) TQString fileName = WidgetWinItem::path() + TQString::fromLocal8Bit("/") + txt + TQString::fromLocal8Bit(".regexp"); TQFileInfo finfo( fileName ); if ( finfo.exists() ) { - int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").tqarg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ); + int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").arg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( answer != KMessageBox::Yes ) return; diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp index 2b6649b..23198be 100644 --- a/kregexpeditor/verifier.cpp +++ b/kregexpeditor/verifier.cpp @@ -97,7 +97,7 @@ void Verifier::setMinimal( bool b ) // // void Verifier::gotoNum( int which ) // { -// TQString anchor = TQString::fromLatin1("match%1").tqarg(which); +// TQString anchor = TQString::fromLatin1("match%1").arg(which); // scrollToAnchor( anchor ); // _current = which; // emit currentChanged( _current ); diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index a5866d6..1ab5d24 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -162,7 +162,7 @@ RegExp* WidgetFactory::createRegExp( TQDomElement node, const TQString& version else if ( tag == TQString::fromLocal8Bit( "Repeat" ) ) regexp = new RepeatRegExp( false ); else { - KMessageBox::sorry( 0, i18n("<p>Unknown tag while reading XML. Tag was <b>%1</b></p>").tqarg(tag), + KMessageBox::sorry( 0, i18n("<p>Unknown tag while reading XML. Tag was <b>%1</b></p>").arg(tag), i18n("Error While Loading From XML File") ) ; return 0; @@ -191,14 +191,14 @@ RegExp* WidgetFactory::createRegExp( TQString str ) // Read the RegularExpression element, and extract the version. TQDomElement top = doc.documentElement(); if (! (top.tagName() == TQString::fromLocal8Bit("RegularExpression")) ) { - KMessageBox::sorry( 0, i18n("<p>XML file did not contain a <b>%1</b> tag.</p>").tqarg(TQString::fromLatin1("RegularExpression")), + KMessageBox::sorry( 0, i18n("<p>XML file did not contain a <b>%1</b> tag.</p>").arg(TQString::fromLatin1("RegularExpression")), i18n("Error While Loading From XML File") ) ; } TQString version = top.attribute( TQString::fromLocal8Bit("version"), KRegExpEditorGUI::version ); TQDomNode child = top.firstChild(); if ( ! child.isElement() ) { KMessageBox::sorry( 0, i18n("<p>Error while reading XML file. The element just below the tag " - "<b>%1</b> was not an element.</p>").tqarg(TQString::fromLatin1("RegularExpression")), + "<b>%1</b> was not an element.</p>").arg(TQString::fromLatin1("RegularExpression")), i18n("Error While Loading From XML File") ) ; } diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp index 7d98609..7c1f6c6 100644 --- a/kregexpeditor/zerowidgets.cpp +++ b/kregexpeditor/zerowidgets.cpp @@ -39,7 +39,7 @@ ZeroWidget::ZeroWidget(TQString txt, RegExpEditorWindow* editorWindow, void ZeroWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("No tqchildren should be added to this widget!"); + qFatal("No children should be added to this widget!"); } TQSize ZeroWidget::sizeHint() const |