Back reference regular expressions are not supported."
"\\1, \\2, ... are back references, 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 %2 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 it(_tqchildren);
+ TQPtrListIterator 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 oldState(_tqchildren.count());
- TQMemArray newState(_tqchildren.count());
+ TQMemArray oldState(_children.count());
+ TQMemArray 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; jupdateSelection( 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 it(_tqchildren);
+ TQPtrListIterator 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 it(_tqchildren);
+ TQPtrListIterator it(_children);
for ( ; *it ; ++it ) {
(*it)->selectWidget( sel );
}
@@ -250,7 +250,7 @@ void MultiContainerWidget::selectWidget( bool sel )
void MultiContainerWidget::updateAll()
{
- for ( TQPtrListIterator it(_tqchildren); *it ; ++it ) {
+ for ( TQPtrListIterator it(_children); *it ; ++it ) {
(*it)->updateAll();
}
RegExpWidget::updateAll();
@@ -258,7 +258,7 @@ void MultiContainerWidget::updateAll()
void MultiContainerWidget::updateCursorRecursively()
{
- for ( TQPtrListIterator it(_tqchildren); *it ; ++it ) {
+ for ( TQPtrListIterator 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 _tqchildren;
+ TQPtrList _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 { $$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); }
| TOK_Dot { $$ = new DotRegExp( false ); }
| TOK_BackRef {
- QString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( $1 );
+ QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $1 );
$$ = new TextRegExp( false, match );
KMessageBox::information(0,i18n("Back reference regular expressions are not supported."
"\\1, \\2, ... are back references, 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 %2 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 ( $1 == '{' || $1 == '}' || $1 == '[' || $1 == ']' || $1 == '\\' ) {
yyerror( "illigal character - needs escaping" );
}
- $$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($1));
+ $$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($1));
}
- | TOK_EscapeChar { $$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($1)); }
+ | TOK_EscapeChar { $$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($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 it(_tqchildren); *it; ++it ) {
+ for ( TQPtrListIterator 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 _tqchildren;
+ TQPtrList _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("Value for attribute %1 was not an integer for element "
"%2
It contained the value %3
")
- .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("Value for attribute %1 was not an integer for element "
"%2
It contained the value %3
")
- .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("Invalid sub element to element TextRange. Tag was %1
").tqarg(child.tagName()),
+ KMessageBox::sorry( 0, i18n("Invalid sub element to element TextRange. Tag was %1
").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("Overwrite named regular expression %1?
").tqarg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") );
+ int answer = KMessageBox::warningYesNo( this, i18n("Overwrite named regular expression %1?
").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("Unknown tag while reading XML. Tag was %1
").tqarg(tag),
+ KMessageBox::sorry( 0, i18n("Unknown tag while reading XML. Tag was %1
").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("XML file did not contain a %1 tag.
").tqarg(TQString::fromLatin1("RegularExpression")),
+ KMessageBox::sorry( 0, i18n("XML file did not contain a %1 tag.
").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("Error while reading XML file. The element just below the tag "
- "%1 was not an element.
").tqarg(TQString::fromLatin1("RegularExpression")),
+ "%1 was not an element.
").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
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index e5bb44a..66d2ef3 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -122,7 +122,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name)
const KSim::Plugin &plugin = KSim::PluginLoader::self().find(name);
if (plugin.isNull() || !plugin.configPage()) {
KMessageBox::sorry(0, i18n("Failed to remove %1's config page due to the "
- "plugin not being loaded or the config page has not been created").tqarg(name.data()));
+ "plugin not being loaded or the config page has not been created").arg(name.data()));
return;
}
@@ -148,7 +148,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
if (plugin.isNull() || !plugin.configPage()) {
KMessageBox::sorry(0, i18n("Failed to add %1's config page due to the plugin"
" not being loaded or the config page has not been created")
- .tqarg(plugin.libName().data()));
+ .arg(plugin.libName().data()));
return;
}
@@ -156,7 +156,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
TQStringList list;
list << ' ' + i18n("Plugins") << ' ' + plugin.name();
- TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").tqarg(plugin.name()),
+ TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").arg(plugin.name()),
plugin.icon());
plugin.configPage()->reparent(pluginFrame, TQPoint(0, 0), true);
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 49e4608..7140e3a 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -173,7 +173,7 @@ void KSim::Sysinfo::sysUpdate()
}
// if (m_config->showProcs()) {
-// m_procsLabel->setText(i18n("Procs: %1").tqarg(sysInfo.procs));
+// m_procsLabel->setText(i18n("Procs: %1").arg(sysInfo.procs));
// }
}
@@ -274,7 +274,7 @@ void KSim::Sysinfo::createView()
m_procsLabel = 0L;
}*/
-// m_layout->tqinvalidate();
+// m_layout->invalidate();
updateGeometry();
adjustSize();
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index af53876..4f91647 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -226,7 +226,7 @@ void KSim::MainView::maskMainView()
TQBitmap rightPixmap(*m_rightFrame->background()->mask());
TQBitmap bottomPixmap(*m_bottomFrame->background()->mask());
- TQSize insideSize(m_pluginLayout->tqgeometry().size());
+ TQSize insideSize(m_pluginLayout->geometry().size());
// make a cleared bigrect where we can put our pixmap masks on
TQBitmap bigBitmap(topLevelWidget()->size(), true);
@@ -243,7 +243,7 @@ void KSim::MainView::maskMainView()
painter.begin(&bigBitmap);
painter.setBrush(color1);
painter.setPen(color1);
- TQRect rect = m_pluginLayout->tqgeometry();
+ TQRect rect = m_pluginLayout->geometry();
rect.moveBy(ofsX, ofsY);
painter.drawRect(rect);
painter.drawPixmap(ofsX, ofsY, topPixmap);
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 388b9ea..b68c073 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -263,7 +263,7 @@ void KSim::Chart::configureObject(bool repaintWidget)
d->krell->show();
}
- // Update our tqgeometry if we need to let any
+ // Update our geometry if we need to let any
// tqlayout know about our sizeHint() change
if (oldSize != sizeHint()) {
// Using resize() here seems to be needed
@@ -333,19 +333,19 @@ void KSim::Chart::setDisplayMeter(bool value)
void KSim::Chart::setText(const TQString &in, const TQString &out)
{
- bool tqrepaint = false;
+ bool repaint = false;
if (d->inText != in) {
- tqrepaint = true;
+ repaint = true;
d->inText = in;
}
if (d->outText != out) {
- tqrepaint = true;
+ repaint = true;
d->outText = out;
}
- if (tqrepaint)
+ if (repaint)
update();
}
@@ -407,13 +407,13 @@ void KSim::Chart::setValue(int valueIn, int valueOut)
void KSim::Chart::setConfigValues()
{
TQFont newFont = font();
- bool tqrepaint = themeLoader().current().fontColours(this,
+ bool repaint = themeLoader().current().fontColours(this,
newFont, d->mColour, d->sColour, d->showShadow);
if (font() != newFont)
setFont(newFont);
- if (tqrepaint)
+ if (repaint)
update();
}
@@ -446,7 +446,7 @@ void KSim::Chart::paintEvent(TQPaintEvent *)
const TQSize &size = chartSize();
TQPixmap pixmap(size);
TQPainter painter;
- painter.tqbegin(&pixmap, this);
+ painter.begin(&pixmap, this);
int location = size.height() / 5;
painter.drawPixmap(0, 0, d->chartPixmap);
@@ -521,7 +521,7 @@ void KSim::Chart::drawChart()
TQPainter painter;
d->graphData.setMask(drawMask(&painter));
- painter.tqbegin(&d->graphData, this);
+ painter.begin(&d->graphData, this);
int position = width() - 1;
TQValueList::ConstIterator it;
@@ -553,7 +553,7 @@ TQSize KSim::Chart::chartSize() const
TQBitmap KSim::Chart::drawMask(TQPainter *painter)
{
TQBitmap bitmap(chartSize(), true);
- painter->tqbegin(&bitmap, this);
+ painter->begin(&bitmap, this);
painter->setPen(color1);
int position = width() - 1;
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 32a18d8..4aa12b0 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -136,10 +136,10 @@ void KSim::Label::clear()
void KSim::Label::setText(const TQString &text)
{
if (text == d->text)
- return; // If the text is the same, no need to tqrepaint etc
+ return; // If the text is the same, no need to repaint etc
TQSize oldSize = sizeHint();
- // set the text of our widget and tqrepaint
+ // set the text of our widget and repaint
d->text = text;
relayoutLabel(oldSize);
}
@@ -183,13 +183,13 @@ const TQColor &KSim::Label::shadowColour() const
void KSim::Label::setConfigValues()
{
TQFont newFont = font();
- bool tqrepaint = themeLoader().current().fontColours(this,
+ bool repaint = themeLoader().current().fontColours(this,
newFont, d->mColour, d->sColour, d->showShadow);
if (font() != newFont)
setFont(newFont);
- if (tqrepaint)
+ if (repaint)
update();
}
@@ -276,13 +276,13 @@ void KSim::Label::setThemePixmap(const TQString &image)
relayoutLabel(oldSize);
}
-void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
+void KSim::Label::relayoutLabel(const TQSize &old, bool repaint)
{
if (sizeHint() != old) {
updateGeometry();
}
- if (tqrepaint)
+ if (repaint)
update();
}
diff --git a/ksim/library/label.h b/ksim/library/label.h
index 8ae9b64..9e24c95 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -196,7 +196,7 @@ namespace KSim
* sets the background image to be painted
*/
void setThemePixmap(const TQString &image);
- void relayoutLabel(const TQSize &old, bool tqrepaint = true);
+ void relayoutLabel(const TQSize &old, bool repaint = true);
private:
/**
diff --git a/ksim/library/led.h b/ksim/library/led.h
index bdb26f4..6dcecce 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -88,7 +88,7 @@ namespace KSim
*/
Type type() const;
/**
- * Force the Led to tqrepaint its state
+ * Force the Led to repaint its state
*/
void update();
diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 775a02e..71b17b7 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -92,13 +92,13 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file)
case KSim::PluginLoader::EmptyLibName:
KMessageBox::error(0, i18n("KSim was unable to load the plugin %1"
" due to the X-KSIM-LIBRARY property being empty in the"
- " plugins desktop file").tqarg(file.readName()));
+ " plugins desktop file").arg(file.readName()));
return false;
break;
case KSim::PluginLoader::LibNotFound:
KMessageBox::error(0, i18n("KSim was unable to load the plugin %1"
" due to not being able to find the plugin, check that the plugin"
- " is installed and is in your $TDEDIR/lib path").tqarg(file.readName()));
+ " is installed and is in your $TDEDIR/lib path").arg(file.readName()));
return false;
break;
case KSim::PluginLoader::UnSymbols:
@@ -108,8 +108,8 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file)
" macro\nThe plugin has been damaged or has"
" some unresolved symbols\n \nLast"
" error message that occurred: \n%3")
- .tqarg(d->lib.prepend("ksim_")).tqarg("KSIM_INIT_PLUGIN")
- .tqarg(d->error));
+ .arg(d->lib.prepend("ksim_")).arg("KSIM_INIT_PLUGIN")
+ .arg(d->error));
return false;
break;
default:
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index a453af2..a7e21da 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -718,14 +718,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font,
TQColor &text, TQColor &shadow, bool &showShadow) const
{
TQString key = KSim::Types::typeToString(type, false);
- bool tqrepaint = false;
+ bool repaint = false;
// set colours from the string 'key'
if (!readEntry(string, key + ".textcolor").isEmpty()) {
text= textColour(string, key + ".textcolor");
shadow = shadowColour(string, key + ".textcolor");
showShadow = textShadow(string, key + ".textcolor");
- tqrepaint = true;
+ repaint = true;
}
else {
text= textColour(string, "*.textcolor");
@@ -737,14 +737,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font,
if (!readEntry(string, key + ".font").isEmpty()) {
if (KSim::ThemeLoader::currentFontItem() != 3) {
font = readFontEntry(string, key + ".font");
- tqrepaint = true;
+ repaint = true;
}
}
else {
font = currentFont();
}
- return tqrepaint;
+ return repaint;
}
bool KSim::Theme::fontColours(const KSim::Base *const base, TQFont &font,
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 2f05e7c..9be4b15 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -201,7 +201,7 @@ void CpuView::updateView()
cpuDiff = 100;
}
- current.chart()->setText(i18n("%1%").tqarg(cpuDiff));
+ current.chart()->setText(i18n("%1%").arg(cpuDiff));
current.chart()->setValue(cpuDiff, 0);
current.label()->setValue(cpuDiff);
}
@@ -420,7 +420,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
for (uint i = 0; i < addCpus(); ++i)
{
- TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").tqarg(i), TQCheckListItem::CheckBox);
+ TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").arg(i), TQCheckListItem::CheckBox);
item->setText(1, "%T");
}
}
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 69c1219..c0123d4 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -216,13 +216,13 @@ void DiskView::updateDisplay()
if (m_useSeperatly) {
it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks);
it.current()->first->setText(i18n("in: %1k")
- .tqarg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
- i18n("out: %1k").tqarg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
+ .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
+ i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
}
else {
it.current()->first->setValue(diff, 0);
it.current()->first->setText(i18n("%1k")
- .tqarg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
+ .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
}
it.current()->second->setMaxValue(it.current()->first->maxValue());
@@ -239,7 +239,7 @@ void DiskView::updateData(DiskList &disks)
if (!m_procStream)
return;
- m_procStream->tqdevice()->reset();
+ m_procStream->device()->reset();
fseek(m_procFile, 0L, SEEK_SET);
if (m_bLinux24)
@@ -430,7 +430,7 @@ TQString DiskView::diskName( int major, int minor ) const
break;
}
- returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor;
+ returnValue.at(2) = returnValue.at(2).latin1() + minor;
return returnValue;
#else
Q_UNUSED(major);
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 3df1917..7286e0f 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -189,7 +189,7 @@ void FilesystemWidget::processExited(KProcess *)
TQStringList::Iterator it;
for (it = errorList.begin(); it != errorList.end(); ++it) {
message += TQString::fromLatin1("%1")
- .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
+ .arg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
}
message += TQString::fromLatin1("
");
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index c265055..66eadf2 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -195,17 +195,17 @@ void I8KView::updateView()
}
if ( rightspeed > 0 )
- m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).tqarg( rightspeed ) );
+ m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).arg( rightspeed ) );
else
m_fan1Label->setText( i18n( "Right fan: Off" ) );
if ( leftspeed > 0 )
- m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).tqarg( leftspeed ) );
+ m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).arg( leftspeed ) );
else
m_fan2Label->setText( i18n( "Left fan: Off" ) );
- m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).tqarg( cputemp )
- .tqarg( m_unit ) );
+ m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).arg( cputemp )
+ .arg( m_unit ) );
}
I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index f6cbe4a..1f35224 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -101,7 +101,7 @@ MailLabel::~MailLabel()
{
}
-void MailLabel::configureObject( bool tqrepaint )
+void MailLabel::configureObject( bool repaint )
{
m_envelope.load( themeLoader().current().mailPixmap() );
m_frames = themeLoader().current().mailFrames();
@@ -112,7 +112,7 @@ void MailLabel::configureObject( bool tqrepaint )
setPixmap( frame( m_envelope, 1 ) );
- KSim::Label::configureObject( tqrepaint );
+ KSim::Label::configureObject( repaint );
}
void MailLabel::paintEvent( TQPaintEvent* e )
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 42e0ffd..140d822 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -356,7 +356,7 @@ void NetView::updateGraph()
if ( ( *it ).label() )
{
timeDisplay = ( *it ).format();
- newPid = pid.tqarg( ( *it ).name() );
+ newPid = pid.arg( ( *it ).name() );
if ( TQFile::exists( newPid ) && stat( TQFile::encodeName( newPid ).data(), &st ) == 0 )
{
@@ -394,16 +394,16 @@ void NetView::updateGraph()
TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
- ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( receiveString ),
- i18n( "out: %1k" ).tqarg( sendString ) );
+ ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ),
+ i18n( "out: %1k" ).arg( sendString ) );
}
else
{
( *it ).setData( NetData() );
( *it ).chart()->setValue( 0, 0 );
- ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
- i18n( "out: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
+ ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
+ i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
if ( ( *it ).label() )
( *it ).label()->setText( i18n( "offline" ) );
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index f3e98b7..b376c24 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -144,8 +144,8 @@ void NetConfig::menu(KListView *, TQListViewItem *item, const TQPoint &)
if (item) {
aboutMenu->insertItem(i18n("&Add Net Device"), 3);
- aboutMenu->insertItem(i18n("&Modify '%1'").tqarg(item->text(0)), 2);
- aboutMenu->insertItem(i18n("&Remove '%1'").tqarg(item->text(0)), 1);
+ aboutMenu->insertItem(i18n("&Modify '%1'").arg(item->text(0)), 2);
+ aboutMenu->insertItem(i18n("&Remove '%1'").arg(item->text(0)), 1);
}
else {
aboutMenu->insertItem(i18n("&Add Net Device"), 3);
@@ -217,7 +217,7 @@ void NetConfig::removeItem(TQListViewItem *item)
return;
int result = KMessageBox::warningContinueCancel(0, i18n("Are you sure you "
- "want to remove the net interface '%1'?").tqarg(item->text(0)), TQString(), KStdGuiItem::del());
+ "want to remove the net interface '%1'?").arg(item->text(0)), TQString(), KStdGuiItem::del());
if (result == KMessageBox::Cancel)
return;
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index e466c66..628c5dd 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -104,7 +104,7 @@