From 7e66d7c3611d907ea28b140281b472bb1c406be6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:00:33 -0600 Subject: Remove additional unneeded tq method conversions --- kdevdesigner/designer/about.ui | 8 +-- kdevdesigner/designer/actiondnd.cpp | 16 +++--- kdevdesigner/designer/command.cpp | 38 ++++++------- kdevdesigner/designer/command.h | 2 +- kdevdesigner/designer/configtoolboxdialog.ui.h | 6 +- kdevdesigner/designer/connectiondialog.ui.h | 2 +- kdevdesigner/designer/connectionitems.cpp | 12 ++-- kdevdesigner/designer/connectionitems.h | 4 +- kdevdesigner/designer/customwidgeteditor.ui | 2 +- kdevdesigner/designer/customwidgeteditorimpl.cpp | 4 +- kdevdesigner/designer/editfunctions.ui | 10 ++-- kdevdesigner/designer/editfunctionsimpl.cpp | 2 +- kdevdesigner/designer/formfile.cpp | 16 +++--- kdevdesigner/designer/formwindow.cpp | 54 +++++++++--------- kdevdesigner/designer/hierarchyview.cpp | 10 ++-- kdevdesigner/designer/iconvieweditorimpl.cpp | 2 +- kdevdesigner/designer/layout.cpp | 18 +++--- kdevdesigner/designer/layout.h | 4 +- kdevdesigner/designer/listboxeditorimpl.cpp | 2 +- kdevdesigner/designer/listviewdnd.cpp | 6 +- kdevdesigner/designer/listvieweditorimpl.cpp | 2 +- kdevdesigner/designer/mainwindow.cpp | 64 ++++++++++----------- kdevdesigner/designer/mainwindowactions.cpp | 72 ++++++++++++------------ kdevdesigner/designer/metadatabase.cpp | 8 +-- kdevdesigner/designer/multilineeditorimpl.cpp | 12 ++-- kdevdesigner/designer/newformimpl.cpp | 4 +- kdevdesigner/designer/outputwindow.cpp | 4 +- kdevdesigner/designer/outputwindow.h | 4 +- kdevdesigner/designer/paletteeditor.ui | 6 +- kdevdesigner/designer/pixmapchooser.cpp | 4 +- kdevdesigner/designer/propertyeditor.cpp | 60 ++++++++++---------- kdevdesigner/designer/propertyeditor.h | 4 +- kdevdesigner/designer/resource.cpp | 16 +++--- kdevdesigner/designer/richtextfontdialog.ui.h | 2 +- kdevdesigner/designer/sizehandle.cpp | 6 +- kdevdesigner/designer/sourcefile.cpp | 8 +-- kdevdesigner/designer/startdialogimpl.cpp | 2 +- kdevdesigner/designer/syntaxhighlighter_html.cpp | 4 +- kdevdesigner/designer/syntaxhighlighter_html.h | 2 +- kdevdesigner/designer/tableeditorimpl.cpp | 2 +- kdevdesigner/designer/widgetfactory.cpp | 8 +-- kdevdesigner/designer/wizardeditorimpl.cpp | 14 ++--- kdevdesigner/designer/workspace.cpp | 4 +- kdevdesigner/shared/ui2uib.cpp | 2 +- kdevdesigner/shared/uib.cpp | 2 +- kdevdesigner/shared/uib.h | 2 +- kdevdesigner/shared/widgetdatabase.cpp | 2 +- kdevdesigner/uilib/qwidgetfactory.cpp | 12 ++-- 48 files changed, 275 insertions(+), 275 deletions(-) (limited to 'kdevdesigner') diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui index 970a19e5..48d53486 100644 --- a/kdevdesigner/designer/about.ui +++ b/kdevdesigner/designer/about.ui @@ -66,7 +66,7 @@ false - + AlignCenter @@ -79,7 +79,7 @@ Version 3.2 - + AlignCenter @@ -92,7 +92,7 @@ Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved. - + AlignCenter @@ -113,7 +113,7 @@ <p>Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.</p><p></p><p>Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - + WordBreak|AlignVCenter|AlignLeft diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 97e27877..df158288 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -349,7 +349,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) menu.insertItem( i18n( "Delete Toolbar" ), 1 ); int res = menu.exec( e->globalPos() ); if ( res != -1 ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -409,7 +409,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -429,7 +429,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( res == ID_DELTOOLBAR ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -464,7 +464,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -487,7 +487,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -504,7 +504,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -571,7 +571,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) } AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -699,7 +699,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) if ( !insertAnchor ) index = 0; AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ). - tqarg( w->name() ).tqarg( caption() ), + arg( w->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index f66ab073..95f9e68a 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -261,19 +261,19 @@ void ResizeCommand::unexecute() InsertCommand::InsertCommand( const TQString &n, FormWindow *fw, TQWidget *w, const TQRect &g ) - : Command( n, fw ), widget( w ), tqgeometry( g ) + : Command( n, fw ), widget( w ), geometry( g ) { } void InsertCommand::execute() { - if ( tqgeometry.size() == TQSize( 0, 0 ) ) { - widget->move( tqgeometry.topLeft() ); + if ( geometry.size() == TQSize( 0, 0 ) ) { + widget->move( geometry.topLeft() ); widget->adjustSize(); } else { - TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() ); + TQSize s = geometry.size().expandedTo( widget->minimumSize() ); s = s.expandedTo( widget->minimumSizeHint() ); - TQRect r( tqgeometry.topLeft(), s ); + TQRect r( geometry.topLeft(), s ); widget->setGeometry( r ); } widget->show(); @@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, TQWidgetList copyOfWidgets = widgets; copyOfWidgets.setAutoDelete(FALSE); - // Include the tqchildren of the selected items when deleting + // Include the children of the selected items when deleting for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); - for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { + TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) { if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); } } - delete tqchildren; + delete children; } } @@ -566,23 +566,23 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { - int align = widget->property( "tqalignment" ).toInt(); + int align = widget->property( "alignment" ).toInt(); align &= ~WordBreak; if ( v.toBool() ) align |= WordBreak; - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { TQVariant val = v; if ( val.toString() == "default" ) @@ -2390,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str ) // remove illegal characters TQString d; char c = 0, i = 0; - while ( !str.tqat(i).isNull() ) { - c = str.tqat(i).latin1(); + while ( !str.at(i).isNull() ) { + c = str.at(i).latin1(); if ( c == '-' || c == ' ' ) d += '_'; else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' ) diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index 909c8ea4..92b08dd3 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -208,7 +208,7 @@ public: private: TQWidget *widget; - TQRect tqgeometry; + TQRect geometry; }; diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 711c51e6..7dcd6530 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool() if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { - // Selected, no tqchildren + // Selected, no children TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); @@ -96,7 +96,7 @@ void ConfigToolboxDialog::addTool() } else if ( !addKids ) { // Children processing not set, so set it // Also find the item were we shall quit - // processing tqchildren...if any such item + // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); @@ -106,7 +106,7 @@ void ConfigToolboxDialog::addTool() } } } else if ( ((*it)->childCount() == 0) && addKids ) { - // Leaf node, and we _do_ process tqchildren + // Leaf node, and we _do_ process children TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index 4969c8fd..25a5d5f2 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -175,7 +175,7 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) { - c->tqrepaint(); + c->repaint(); if ( c->isValid() ) connectionsTable->verticalHeader()->setLabel( c->row(), *validConnection, TQString() ); diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index edc11423..12b03a1d 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -49,11 +49,11 @@ static const char* const ignore_slots[] = { "update()", "update(int,int,int,int)", "update(const TQRect&)", - "tqrepaint()", - "tqrepaint(bool)", - "tqrepaint(int,int,int,int,bool)", - "tqrepaint(const TQRect&,bool)", - "tqrepaint(const TQRegion&,bool)", + "repaint()", + "repaint(bool)", + "repaint(int,int,int,int,bool)", + "repaint(const TQRect&,bool)", + "repaint(const TQRegion&,bool)", "show()", "hide()", "iconify()", @@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, p->setFont( f ); } - p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() ); + p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() ); p->setFont( oldf ); } diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 4087c59f..76c57065 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -183,7 +183,7 @@ public: } bool isModified() const { return mod; } - void setModified( bool b ) { mod = b; tqrepaint(); } + void setModified( bool b ) { mod = b; repaint(); } bool isValid() const { return se->currentText()[0] != '<' && si->currentText()[0] != '<' && @@ -191,7 +191,7 @@ public: sl->currentText()[0] != '<'; } - void tqrepaint() { + void repaint() { se->table()->updateCell( se->row(), se->col() ); si->table()->updateCell( si->row(), si->col() ); re->table()->updateCell( re->row(), re->col() ); diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index e6e7553f..85e09c9b 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -546,7 +546,7 @@ <p><b>Container Widget</b></p> -<p>If this custom widget is able to contain other widgets (tqchildren), check this checkbox.</p> +<p>If this custom widget is able to contain other widgets (children), check this checkbox.</p> diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index f5346ed3..869a894c 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked() TQMessageBox::information( this, i18n( "Adding Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " - "to add another widget with this name." ).tqarg( s ) ); + "to add another widget with this name." ).arg( s ) ); return; } @@ -397,7 +397,7 @@ void CustomWidgetEditor::checkWidgetName() TQMessageBox::information( this, i18n( "Renaming Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " - "to rename this widget with this name." ).tqarg( s ) ); + "to rename this widget with this name." ).arg( s ) ); if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) { boxWidgets->setCurrentItem( i ); tqApp->processEvents(); diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index e530a31a..c3483b1d 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -283,7 +283,7 @@ &Function: - + AlignVCenter|AlignRight @@ -316,7 +316,7 @@ &Return type: - + AlignVCenter|AlignRight @@ -379,7 +379,7 @@ S&pecifier: - + AlignVCenter|AlignRight @@ -432,7 +432,7 @@ &Access: - + WordBreak|AlignVCenter|AlignRight @@ -480,7 +480,7 @@ &Type: - + AlignVCenter|AlignRight diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index b28ff0ad..1f39da2c 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -132,7 +132,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) void EditFunctions::okClicked() { TQValueList functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); - TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() ); + TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); TQPtrList commands; TQValueList::Iterator fit; if ( !functionList.isEmpty() ) { diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 08b4bd1e..325862aa 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) f2.writeBlock( data ); } else { TQMessageBox::warning( MainWindow::self, i18n( "Save" ), - i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); + i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } } @@ -215,7 +215,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) f2.writeBlock( data ); } else if ( tqApp->type() != TQApplication::Tty ) { TQMessageBox::warning( MainWindow::self, i18n( "Save" ), - i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); + i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } } @@ -227,7 +227,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow ); if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) { if ( MainWindow::self ) - MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) ); + MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) ); if ( formCodeOnly ) return FALSE; return saveAs(); @@ -263,7 +263,7 @@ bool FormFile::saveAs( bool ignoreModified ) fn = KFileDialog::getSaveFileName( f, i18n( "*.ui|TQt User-Interface Files" ) + "\n" + i18n( "*|All Files" ), MainWindow::self, /*0,*/ - i18n( "Save Form '%1' As").tqarg( formName() )/*, + i18n( "Save Form '%1' As").arg( formName() )/*, MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ ); if ( fn.isEmpty() ) return FALSE; @@ -294,7 +294,7 @@ bool FormFile::saveAs( bool ignoreModified ) pro->setModified( TRUE ); timeStamp.setFileName( pro->makeAbsolute( codeFile() ) ); if ( ed && TQT_TQOBJECT(formWindow()) ) - ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) ); + ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) ); setModified( TRUE ); if ( pro->isDummy() ) fw->mainWindow()->addRecentlyOpenedFile( fn ); @@ -326,7 +326,7 @@ bool FormFile::closeEvent() editor()->save(); switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ), - i18n( "Save changes to form '%1'?" ).tqarg( filename ), + i18n( "Save changes to form '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) @@ -653,7 +653,7 @@ void FormFile::checkTimeStamp() if ( codeEdited ) { if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), i18n( "File '%1' has been changed outside TQt Designer.\n" - "Do you want to reload it?" ).tqarg( timeStamp.fileName() ), + "Do you want to reload it?" ).arg( timeStamp.fileName() ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { TQFile f( timeStamp.fileName() ); if ( f.open( IO_ReadOnly ) ) { @@ -854,7 +854,7 @@ bool FormFile::checkFileName( bool allowBreak ) if ( ff ) TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a form with a\n" - "filename of '%1'. Please choose a new filename." ).tqarg( filename ) ); + "filename of '%1'. Please choose a new filename." ).arg( filename ) ); while ( ff ) { TQString fn; while ( fn.isEmpty() ) { diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 7da756de..77fb2c3f 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -108,7 +108,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw ) } } -#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows +#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows #include static void flickerfree_update( TQWidget *w ) { @@ -383,13 +383,13 @@ void FormWindow::insertWidget() "properties as well as signals and slots to integrate custom widgets into " "TQt Designer, and provide a pixmap which will be used to represent " "the widget on the form.

") - .tqarg(WidgetDatabase::toolTip( id )) ); - TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); + .arg(WidgetDatabase::toolTip( id )) ); + TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) ); } else { TQString tt = WidgetDatabase::toolTip( id ); TQString wt = WidgetDatabase::whatsThis( id ); if ( !wt.isEmpty() && !tt.isEmpty() ) - TQWhatsThis::add( w, TQString("A %1

%2

").tqarg( tt ).tqarg( wt ) ); + TQWhatsThis::add( w, TQString("A %1

%2

").arg( tt ).arg( wt ) ); } TQString s = w->name(); @@ -463,13 +463,13 @@ void FormWindow::insertWidget() else setCursorToAll( CrossCursor, w ); - InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); + InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r ); TQPtrList commands; commands.append( mv ); commands.append( cmd ); - MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, commands ); + MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands ); commandHistory()->addCommand( mc ); mc->execute(); } @@ -479,7 +479,7 @@ void FormWindow::insertWidget() else setCursorToAll( CrossCursor, w ); - InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); + InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -510,13 +510,13 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) "properties as well as signals and slots to integrate custom widgets into " "TQt Designer, and provide a pixmap which will be used to represent " "the widget on the form.

") - .tqarg(WidgetDatabase::toolTip( id )) ); - TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); + .arg(WidgetDatabase::toolTip( id )) ); + TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) ); } else { TQString tt = WidgetDatabase::toolTip( id ); TQString wt = WidgetDatabase::whatsThis( id ); if ( !wt.isEmpty() && !tt.isEmpty() ) - TQWhatsThis::add( w, TQString("A %1

%2

").tqarg( tt ).tqarg( wt ) ); + TQWhatsThis::add( w, TQString("A %1

%2

").arg( tt ).arg( wt ) ); } restoreCursors( w, this ); @@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving + if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving widgetPressed = TRUE; widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); @@ -660,9 +660,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; clearSelection( FALSE ); validForBuddy = TRUE; - mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) ); + mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) ); } else { - mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) ); + mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) ); } saveBackground(); startPos = mapFromGlobal( e->globalPos() ); @@ -837,7 +837,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) // finally move the selected widgets and show/update preview label moveSelectedWidgets( x - p.x(), y - p.y() ); - sizePreviewLabel->setText( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) ); + sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) ); sizePreviewLabel->adjustSize(); TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); checkPreviewGeometry( lg ); @@ -871,7 +871,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( newendWidget && ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; - mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ). + mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); tqApp->processEvents(); @@ -899,10 +899,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; if ( endWidget ) - mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ). + mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); else - mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) ); + mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); tqApp->processEvents(); if ( drawRecRect && oldendWidget ) @@ -1044,7 +1044,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) TQString oldBuddy = startWidget->property( "buddy" ).toString(); if ( oldBuddy.isNull() ) oldBuddy = ""; - SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ), + SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ), this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(), "buddy", startWidget->property( "buddy" ), endWidget->name(), endWidget->name(), @@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi if ( currRect == r ) { TQString t = i18n( "%1/%2" ); - t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); + t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); return; } @@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi currRect = r; if ( t == Insert ) { TQString t = i18n( "%1/%2" ); - t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); + t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); } unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); @@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize() TQPtrList commands; TQWidgetList widgets = selectedWidgets(); if ( widgets.isEmpty() ) { - TQRect oldr = tqgeometry(); + TQRect oldr = geometry(); mainContainer()->adjustSize(); resize( mainContainer()->size() ); // check whether our own size constraint hit us if ( size() != mainContainer()->size() ) mainContainer()->resize( size() ); - TQRect nr = tqgeometry(); + TQRect nr = geometry(); if ( oldr != nr ) { ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr ); commandHistory()->addCommand( cmd ); @@ -1518,9 +1518,9 @@ void FormWindow::editAdjustSize() for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) { if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) continue; - TQRect oldr = w->tqgeometry(); + TQRect oldr = w->geometry(); w->adjustSize(); - TQRect nr = w->tqgeometry(); + TQRect nr = w->geometry(); if ( oldr != nr ) commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) ); } @@ -1759,7 +1759,7 @@ void FormWindow::currentToolChanged() emitShowProperties( TQT_TQOBJECT(mainContainer()) ); break; default: - mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) ); + mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) emitShowProperties( TQT_TQOBJECT(mainContainer()) ); @@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets() if ( !missingCustomWidgets.isEmpty() ) { TQString txt = i18n( "The following custom widgets are used in '%1',\n" - "but are not known to TQt Designer:\n" ).tqarg( name() ); + "but are not known to TQt Designer:\n" ).arg( name() ); for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit ) txt += " " + *sit + "\n"; txt += i18n( "If you save this form and generate code for it using uic, \n" @@ -1935,7 +1935,7 @@ void FormWindow::checkAccels() ok = FALSE; switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count() - ).tqarg( it.key().upper() ), + ).arg( it.key().upper() ), i18n( "&Select" ), i18n( "&Cancel" ), TQString(), 2 ) ) { case 0: // select diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index c91f5333..e6f56f8c 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -654,7 +654,7 @@ void HierarchyList::removeTabPage() QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dtw->pageTitle() ).tqarg( tw->name() ), + arg( dtw->pageTitle() ).arg( tw->name() ), formWindow, tw, tw->currentPage() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -665,7 +665,7 @@ void HierarchyList::removeTabPage() QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dw->pageTitle() ).tqarg( wiz->name() ), + arg( dw->pageTitle() ).arg( wiz->name() ), formWindow, wiz, wiz->indexOf( wiz->currentPage() ), TRUE ); formWindow->commandHistory()->addCommand( cmd ); @@ -1102,11 +1102,11 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( i->rtti() == HierarchyItem::Definition ) i = i->parent(); ListEditor dia( this, 0, TRUE ); - dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) ); + dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); dia.setList( entries ); dia.exec(); - Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow, + Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow, lIface, i->text( 0 ), dia.items() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i ) lst << i->text( 0 ); i = i->nextSibling(); } - Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow, + Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow, lIface, p->text( 0 ), lst ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 07db9813..a5781e89 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -129,7 +129,7 @@ void IconViewEditor::applyClicked() items.append( item ); } - PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ), + PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ), formwindow, iconview, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 33a6877b..56694eda 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -67,7 +67,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l widgets.setAutoDelete( FALSE ); layoutBase = lb; if ( !doSetup && layoutBase ) - oldGeometry = layoutBase->tqgeometry(); + oldGeometry = layoutBase->geometry(); } /*! The widget list we got in the constructor might contain too much @@ -236,7 +236,7 @@ void Layout::breakLayout() if ( !widgets.isEmpty() ) { TQWidget *w; for ( w = widgets.first(); w; w = widgets.next() ) - rects.insert( w, w->tqgeometry() ); + rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || @@ -318,7 +318,7 @@ void HorizontalLayout::doLayout() w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else tqlayout->addWidget( w ); if ( ::tqqt_cast(w) ) @@ -382,7 +382,7 @@ void VerticalLayout::doLayout() w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else tqlayout->addWidget( w ); if ( ::tqqt_cast(w) ) @@ -759,9 +759,9 @@ void GridLayout::doLayout() if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { - tqlayout->addWidget( w, r, c, ::tqqt_cast(w) ? ( (Spacer*)w )->tqalignment() : 0 ); + tqlayout->addWidget( w, r, c, ::tqqt_cast(w) ? ( (Spacer*)w )->alignment() : 0 ); } else { - tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast(w) ? ( (Spacer*)w )->tqalignment() : 0 ); + tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast(w) ? ( (Spacer*)w )->alignment() : 0 ); } if ( ::tqqt_cast(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); @@ -798,7 +798,7 @@ void GridLayout::buildGrid() int index = 0; TQWidget* w = 0; for ( w = widgets.first(); w; w = widgets.next() ) { - TQRect widgetPos = w->tqgeometry(); + TQRect widgetPos = w->geometry(); x[index] = widgetPos.left(); x[index+1] = widgetPos.right(); y[index] = widgetPos.top(); @@ -837,7 +837,7 @@ void GridLayout::buildGrid() // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { - TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); + TQRect c(0,0,0,0), widgetPos = w->geometry(); // From left til right (not including) for (uint cw=0; cwname() ), + PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ), formwindow, listbox, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index 9a9a59e6..32dcc6d5 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -142,12 +142,12 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { - // Selected, no tqchildren + // Selected, no children list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it // Also find the item were we shall quit - // processing tqchildren...if any such item + // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); @@ -157,7 +157,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) } } } else if ( ((*it)->childCount() == 0) && addKids ) { - // Leaf node, and we _do_ process tqchildren + // Leaf node, and we _do_ process children list.append( *it ); } } diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index 9e6c54ed..bd6c0e64 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw void ListViewEditor::applyClicked() { setupItems(); - PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ), + PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ), formwindow, listview, itemsPreview ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index e337efb6..e6a6b575 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -1484,11 +1484,11 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, actionEditUndo->setEnabled( undoAvailable ); actionEditRedo->setEnabled( redoAvailable ); if ( !undoCmd.isEmpty() ) - actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) ); + actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) ); else actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) ); if ( !redoCmd.isEmpty() ) - actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) ); + actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) ); else actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) ); @@ -1721,7 +1721,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid bool ok = FALSE; bool oldDoWrap = FALSE; if ( ::tqqt_cast(w) ) { - int align = w->property( "tqalignment" ).toInt(); + int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } @@ -1737,7 +1737,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid } if ( ok ) { if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "wordwrap", TQVariant( oldDoWrap, 0 ), TQVariant( doWrap, 0 ), TQString(), TQString() ); @@ -1746,7 +1746,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); } - TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); @@ -1759,7 +1759,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property( "title" ), title, TQString(), TQString() ); @@ -1772,7 +1772,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pageTitle", w->property( "pageTitle" ), @@ -1785,7 +1785,7 @@ void MainWindow::handleRMBProperties( int id, TQMap &props, TQWid TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap(); TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); if ( !pix.isNull() ) { - TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pixmap", w->property( "pixmap" ), pix, TQString(), TQString() ); @@ -1802,7 +1802,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command TQTabWidget *tw = (TQTabWidget*)w; if ( id == commands[ "add" ] ) { AddTabPageCommand *cmd = - new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(), + new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(), tw, "Tab" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1811,7 +1811,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dtw->pageTitle() ).tqarg( tw->name() ), + arg( dtw->pageTitle() ).arg( tw->name() ), formWindow(), tw, tw->currentPage() ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1821,7 +1821,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command TQToolBox *tb = (TQToolBox*)w; if ( id == commands[ "add" ] ) { AddToolBoxPageCommand *cmd = - new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ), + new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ), formWindow(), tb, "Page" ); formWindow()->commandHistory()->addCommand( cmd ); @@ -1841,7 +1841,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; if ( id == commands[ "add" ] ) { AddWidgetStackPageCommand *cmd = - new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ), + new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ), formWindow(), ws ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1849,14 +1849,14 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command if ( ws->visibleWidget() ) { DeleteWidgetStackPageCommand *cmd = new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( ws->currentPage() ).tqarg( ws->name() ), + arg( ws->currentPage() ).arg( ws->name() ), formWindow(), ws, ws->visibleWidget() ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); } } else if ( id == commands[ "nextpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "currentPage", currentPage, @@ -1866,7 +1866,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); } else if ( id == commands[ "prevpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "currentPage", currentPage, @@ -1881,7 +1881,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { if ( id == commands[ "add" ] ) { AddContainerPageCommand *cmd = - new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ), + new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ), formWindow(), w, "Page" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1892,7 +1892,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command int index = iface->currentIndex( wClassName, w ); DeleteContainerPageCommand *cmd = new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( iface->pageLabel( wClassName, + arg( iface->pageLabel( wClassName, w, index ) ). arg( w->name() ), formWindow(), w, index ); @@ -1942,7 +1942,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command TQWizard *wiz = (TQWizard*)fw->mainContainer(); if ( id == commands[ "add" ] ) { AddWizardPageCommand *cmd = - new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ), + new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ), formWindow(), wiz, "WizardPage" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1951,7 +1951,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dw->pageTitle() ).tqarg( wiz->name() ), + arg( dw->pageTitle() ).arg( wiz->name() ), formWindow(), wiz, wiz->indexOf( wiz->currentPage() ) ); formWindow()->commandHistory()->addCommand( cmd ); @@ -1968,7 +1968,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, dw->pageTitle(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Rename page %1 of %2" ).tqarg( dw->pageTitle() ).tqarg( wiz->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formWindow() , wiz, wiz->indexOf( wiz->currentPage() ), text ); @@ -1980,13 +1980,13 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if ( id == commands[ "add_toolbar" ] ) { AddToolBarCommand *cmd = - new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ), + new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ), formWindow(), mw ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( id == commands[ "add_menu_item" ] ) { AddMenuCommand *cmd = - new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ), + new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ), formWindow(), mw ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -2333,7 +2333,7 @@ void MainWindow::readConfig() r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) ); r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) ); - TQRect desk = TQApplication::desktop()->tqgeometry(); + TQRect desk = TQApplication::desktop()->geometry(); TQRect inter = desk.intersect( r ); resize( r.size() ); if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) { @@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e ) ++it; if ( pro->isModified() ) { switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), - i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), + i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save pro->save(); @@ -2610,7 +2610,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { - statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) ); + statusMessage( i18n( "Edit %1..." ).arg( w->className() ) ); WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() ); statusBar()->clear(); @@ -2623,7 +2623,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) bool ok = FALSE; bool oldDoWrap = FALSE; if ( ::tqqt_cast(w) ) { - int align = w->property( "tqalignment" ).toInt(); + int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } @@ -2640,7 +2640,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) } if ( ok ) { if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "wordwrap", TQVariant( oldDoWrap, 0 ), TQVariant( doWrap, 0 ), TQString(), TQString() ); @@ -2649,7 +2649,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); } - TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); @@ -2664,7 +2664,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString text; text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property( "title" ), text, TQString(), TQString() ); @@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI() a->setToggleAction( TRUE ); a->setText( w->className ); a->setIconSet( *w->pixmap ); - a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) ); + a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) ); a->setWhatsThis( i18n("%1 (custom widget)" "

Click Edit Custom Widgets... in the Tools|Custom menu to " "add and change custom widgets. You can add properties as well as " "signals and slots to integrate them into TQt Designer, " - "and provide a pixmap which will be used to represent the widget on the form.

").tqarg( w->className ) ); + "and provide a pixmap which will be used to represent the widget on the form.

").arg( w->className ) ); a->addTo( customWidgetToolBar ); a->addTo( customWidgetToolBar2 ); @@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource ) if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return; } diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 484b0aec..b7fc6b33 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -225,7 +225,7 @@ void MainWindow::setupEditActions() /* TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); - TQWhatsThis::add( tb, i18n( "The Edit toolbar%1").tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "The Edit toolbar%1").arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "Edit" ) ); actionEditUndo->addTo( tb ); actionEditRedo->addTo( tb ); @@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions() actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() ); actionInsertSpacer->setToggleAction( TRUE ); actionInsertSpacer->setText( WidgetDatabase::className( id ) ); - actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) ); + actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) ); actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) ); actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) ); - actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) ); + actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) ); actionInsertSpacer->setWhatsThis( i18n("A %1

%2

" "

Click to insert a single %3," "or double click to keep the tool selected.") - .tqarg(WidgetDatabase::toolTip( id )) - .tqarg(WidgetDatabase::whatsThis( id )) - .tqarg(WidgetDatabase::toolTip( id ) )); + .arg(WidgetDatabase::toolTip( id )) + .arg(WidgetDatabase::whatsThis( id )) + .arg(WidgetDatabase::toolTip( id ) )); actionInsertSpacer->addTo( commonWidgetsToolBar ); commonWidgetsPage.append( actionInsertSpacer ); TQWidget *w; commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); - TQWhatsThis::add( layoutToolBar, i18n( "The Layout toolbar%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( layoutToolBar, i18n( "The Layout toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); actionEditAdjustSize->addTo( layoutToolBar ); layoutToolBar->addSeparator(); actionEditHLayout->addTo( layoutToolBar ); @@ -461,7 +461,7 @@ void MainWindow::setupToolActions() TQToolBar *tb = new TQToolBar( this, "Tools" ); tb->setCloseMode( TQDockWindow::Undocked ); toolsToolBar = tb; - TQWhatsThis::add( tb, i18n( "The Tools toolbar%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "The Tools toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE ); actionPointerTool->addTo( tb ); @@ -505,13 +505,13 @@ void MainWindow::setupToolActions() widgetToolBars.append( tb ); bool plural = grp[(int)grp.length()-1] == 's'; if ( plural ) { - TQWhatsThis::add( tb, i18n( "The %1%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). - tqarg( i18n(" Click on a button to insert a single widget, " - "or double click to insert multiple %1.") ).tqarg(grp)) ); + TQWhatsThis::add( tb, i18n( "The %1%2" ).arg(grp).arg(i18n(toolbarHelp). + arg( i18n(" Click on a button to insert a single widget, " + "or double click to insert multiple %1.") ).arg(grp)) ); } else { - TQWhatsThis::add( tb, i18n( "The %1 Widgets%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). - tqarg( i18n(" Click on a button to insert a single %1 widget, " - "or double click to insert multiple widgets.") ).tqarg(grp)) ); + TQWhatsThis::add( tb, i18n( "The %1 Widgets%2" ).arg(grp).arg(i18n(toolbarHelp). + arg( i18n(" Click on a button to insert a single %1 widget, " + "or double click to insert multiple widgets.") ).arg(grp)) ); } addToolBar( tb, grp ); tb->hide(); @@ -552,11 +552,11 @@ void MainWindow::setupToolActions() a->setToolTip( ttip ); if ( !WidgetDatabase::isWhatsThisLoaded() ) WidgetDatabase::loadWhatsThis( documentationPath() ); - a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) ); + a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) ); - TQString whats = i18n("A %1").tqarg( WidgetDatabase::className( i ) ); + TQString whats = i18n("A %1").arg( WidgetDatabase::className( i ) ); if ( !WidgetDatabase::whatsThis( i ).isEmpty() ) - whats += TQString("

%1

").tqarg(WidgetDatabase::whatsThis( i )); + whats += TQString("

%1

").arg(WidgetDatabase::whatsThis( i )); a->setWhatsThis( whats+ i18n("

Double click on this tool to keep it selected.

") ); if ( grp != "KDE" ) @@ -617,7 +617,7 @@ void MainWindow::setupFileActions() tb->setCloseMode( TQDockWindow::Undocked ); projectToolBar = tb; - TQWhatsThis::add( tb, i18n( "The File toolbar%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "The File toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "File" ) ); fileMenu = new TQPopupMenu( this, "File" ); menubar->insertItem( i18n( "&File" ), fileMenu ); @@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions() else if ( *it == "MotifPlus" ) info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); - a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(), - i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 ); - a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) ); + a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(), + i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 ); + a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) ); a->setWhatsThis( i18n("Open a preview in %1 style." "

Use the preview to test the design and " - "signal-slot connections of the current form. %2

").tqarg( *it ).tqarg( info ) ); + "signal-slot connections of the current form. %2

").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); @@ -965,7 +965,7 @@ void MainWindow::setupWindowActions() j++; TQString itemText; if ( j < 10 ) - itemText = TQString("&%1 ").tqarg( j ); + itemText = TQString("&%1 ").arg( j ); if ( ::tqqt_cast(w) ) itemText += w->name(); else @@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions() /* TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); - TQWhatsThis::add( tb, i18n( "The Help toolbar%1" ).tqarg(i18n(toolbarHelp).tqarg("") )); + TQWhatsThis::add( tb, i18n( "The Help toolbar%1" ).arg(i18n(toolbarHelp).arg("") )); addToolBar( tb, i18n( "Help" ) ); actionHelpWhatsThis->addTo( tb );*/ @@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject() if ( a ) { if ( pro->isModified() ) { switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), - i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), + i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save pro->save(); @@ -1166,7 +1166,7 @@ void MainWindow::fileCloseProject() currentProject = 0; if ( lastValid ) { projectSelected( lastValid ); - statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) ); + statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) ); } if ( !windows.isEmpty() ) { for ( TQWidget *w = windows.first(); w; w = windows.next() ) { @@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co arg( filename )/*, 3000*/ ); return; } - statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) ); + statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) ); TQStringList list = iface->import( filter, filename ); iface->release(); if ( list.isEmpty() ) { - statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ ); + statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ ); return; } if ( !inProject ) @@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile return formWindow(); } - statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) ); + statusMessage( i18n( "Reading file '%1'...").arg( filename ) ); FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); if ( ff2 && ff2->formWindow() ) { ff2->formWindow()->setFocus(); @@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile TQApplication::restoreOverrideCursor(); if ( b ) { rebuildCustomWidgetGUI(); - statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */); + statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */); } else { - statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */); - TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) ); + statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */); + TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) ); delete ff; } return (FormWindow*)resource.widget(); @@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm() bool MainWindow::fileSaveProject() { currentProject->save(); - statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */); + statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */); return TRUE; } @@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate() ts << " " << cn << "Form" << endl; ts << "" << endl; ts << "" << endl; - ts << " tqgeometry" << endl; + ts << " geometry" << endl; ts << " " << endl; ts << " 300" << endl; ts << " 400" << endl; @@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor() if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return 0; } @@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f ) if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return 0; } diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index ffd736c4..6ac84af6 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -167,14 +167,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo if ( doUpdate && ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { doUpdate = FALSE; - setPropertyChanged( o, "tqalignment", changed || + setPropertyChanged( o, "alignment", changed || isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "wordwrap" ) ); doUpdate = TRUE; } - if ( doUpdate && property == "tqalignment" ) { + if ( doUpdate && property == "alignment" ) { doUpdate = FALSE; setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "vAlign", changed ); @@ -648,9 +648,9 @@ void MetaDataBase::doConnections( TQObject *o ) delete l; } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( conn.slot.data() ); TQStrList signalList = sender->metaObject()->signalNames( TRUE ); TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 46ec8097..c883da66 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget if ( oldWrapString != "NoWrap" ) doWrap = TRUE; } - textEdit->setAlignment( mlined->tqalignment() ); + textEdit->setAlignment( mlined->alignment() ); textEdit->setWordWrap( mlined->wordWrap() ); textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() ); textEdit->setWrapPolicy( mlined->wrapPolicy() ); @@ -276,13 +276,13 @@ void MultiLineEditor::okClicked() void MultiLineEditor::applyClicked() { if ( !callStatic ) { - PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ), + PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ), formwindow, mlined, textEdit->text() ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) ); + TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) ); SetPropertyCommand *propcmd; if ( doWrap ) propcmd = new SetPropertyCommand( pn, formwindow, @@ -325,7 +325,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); - buf = TQString( "<%1>%3" ).tqarg( tag ).tqarg( tagend ).tqarg( buf ); + buf = TQString( "<%1>%3" ).arg( tag ).arg( tagend ).arg( buf ); textEdit->removeSelectedText(); textEdit->insertAt( buf, pfrom, ifrom ); textEdit->setCursorPosition( pto, ito + 2 + tag.length() ); @@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) else { int para, index; textEdit->getCursorPosition( ¶, &index ); - textEdit->insert( TQString( "<%1>" ).tqarg( tag ).tqarg( tagend ) ); + textEdit->insert( TQString( "<%1>" ).arg( tag ).arg( tagend ) ); index += 2 + tag.length(); textEdit->setCursorPosition( para, index ); } @@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog() if ( fd->getFont() != "default" ) font = "face=\"" + fd->getFont() + "\""; TQString tag( TQString( "font %1 %2 %3" ) - .tqarg( color ).tqarg( size ).tqarg( font ) ); + .arg( color ).arg( size ).arg( font ) ); if ( selText ) textEdit->setSelection( pfrom, ifrom, pto, ito ); diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 6026a9bd..2d631833 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -158,7 +158,7 @@ void CustomFormItem::insert( Project *pro ) FormFile *ff = new FormFile( filename, TRUE, pro ); if ( !resource.load( ff ) ) { TQMessageBox::information( MainWindow::self, i18n("Load Template"), - i18n("Could not load form description from template '%1'" ).tqarg( filename ) ); + i18n("Could not load form description from template '%1'" ).arg( filename ) ); delete ff; return; } @@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView, TQStringList languages = MetaDataBase::languages(); if ( !MainWindow::self->singleProjectMode() ) { for ( it = languages.begin(); it != languages.end(); ++it ) { - ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) ); + ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) ); allItems.append( pi ); pi->setLanguage( *it ); pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) ); diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 33113ef5..93f76e17 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -196,7 +196,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString } void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQColorGroup g( cg ); g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow ); @@ -205,5 +205,5 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, f.setBold( TRUE ); p->setFont( f ); } - TQListViewItem::paintCell( p, g, column, width, tqalignment ); + TQListViewItem::paintCell( p, g, column, width, alignment ); } diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h index 04ebc065..a3276da6 100644 --- a/kdevdesigner/designer/outputwindow.h +++ b/kdevdesigner/designer/outputwindow.h @@ -45,9 +45,9 @@ public: const TQString &locationString, TQObject *locationObject ); void paintCell( TQPainter *, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); - void setRead( bool b ) { read = b; tqrepaint(); } + void setRead( bool b ) { read = b; repaint(); } TQObject *location() const { return object; } int line() const { return text( 2 ).toInt(); } diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui index 607c52fb..32b14b54 100644 --- a/kdevdesigner/designer/paletteeditor.ui +++ b/kdevdesigner/designer/paletteeditor.ui @@ -69,7 +69,7 @@ Build Palette - + AlignAuto @@ -110,7 +110,7 @@ &3-D effects: - + AlignAuto|AlignVCenter @@ -168,7 +168,7 @@ Back&ground: - + AlignAuto|AlignVCenter diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 92410960..976343bd 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -66,7 +66,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->tqrepaint( FALSE ); + viewport()->repaint( FALSE ); } void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) @@ -98,7 +98,7 @@ static void buildImageFormatList( TQString &filter, TQString &all ) else outputExtension = "jpg;*.jpeg"; filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )). - tqarg( outputFormat ).tqarg( "*." + outputExtension); + arg( outputFormat ).arg( "*." + outputExtension); all += "*." + outputExtension + ";"; } filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 37bbc596..7bae00b5 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -119,7 +119,7 @@ static TQStringList getFontList() fontDataBase = new TQFontDatabase; qAddPostRoutine( cleanupFontDatabase ); } - return fontDataBase->tqfamilies(); + return fontDataBase->families(); } @@ -329,9 +329,9 @@ void PropertyItem::setOpen( bool b ) open = b; if ( !open ) { - tqchildren.setAutoDelete( TRUE ); - tqchildren.clear(); - tqchildren.setAutoDelete( FALSE ); + children.setAutoDelete( TRUE ); + children.clear(); + children.setAutoDelete( FALSE ); tqApp->processEvents(); listview->updateEditorSize(); return; @@ -387,7 +387,7 @@ void PropertyItem::setChanged( bool b, bool updateDb ) if ( changed == b ) return; changed = b; - tqrepaint(); + repaint(); if ( updateDb ) { MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed ); } @@ -491,18 +491,18 @@ void PropertyItem::childValueChanged( PropertyItem * ) void PropertyItem::addChild( PropertyItem *i ) { - tqchildren.append( i ); + children.append( i ); } int PropertyItem::childCount() const { - return tqchildren.count(); + return children.count(); } PropertyItem *PropertyItem::child( int i ) const { // ARRRRRRRRG - return ( (PropertyItem*)this )->tqchildren.at( i ); + return ( (PropertyItem*)this )->children.at( i ); } /*! If the contents of the item is not displayable with a text, but @@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v ) else pixPrev->setPixmap( v.toImage() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPixmapItem::getPixmap() @@ -1726,8 +1726,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) // -------------------------------------------------------------- PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ) - : PropertyItem( l, after, prop, propName ), withChildren( tqchildren ) + const TQString &propName, bool children ) + : PropertyItem( l, after, prop, propName ), withChildren( children ) { box = new TQHBox( listview->viewport() ); box->hide(); @@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v ) return; TQString s = i18n( "%1/%2/%3/%4" ); - s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ). + s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ). arg( size_type_to_string( v.toSizePolicy().verData() ) ). arg( v.toSizePolicy().horStretch() ). arg( v.toSizePolicy().verStretch() ); @@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v ) TQString s; palettePrev->setPalette( v.toPalette() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPaletteItem::getPalette() @@ -2411,7 +2411,7 @@ void PropertyCursorItem::showEditor() PropertyItem::showEditor(); if ( !comb ) { combo()->blockSignals( TRUE ); - combo()->setCurrentItem( (int)value().toCursor().tqshape() ); + combo()->setCurrentItem( (int)value().toCursor().shape() ); combo()->blockSignals( FALSE ); } placeEditor( combo() ); @@ -2434,7 +2434,7 @@ void PropertyCursorItem::setValue( const TQVariant &v ) return; combo()->blockSignals( TRUE ); - combo()->setCurrentItem( (int)v.toCursor().tqshape() ); + combo()->setCurrentItem( (int)v.toCursor().shape() ); combo()->blockSignals( FALSE ); setText( 1, combo()->currentText() ); PropertyItem::setValue( v ); @@ -2730,7 +2730,7 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); @@ -2750,7 +2750,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } popup(); @@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e ) void EnumBox::restoreArrow() { arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } void EnumBox::setText( const TQString &text ) { str = text; - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -3164,7 +3164,7 @@ void PropertyList::setupProperties() isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) && ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) { if ( p->isSetType() ) { - if ( TQString( p->name() ) == "tqalignment" ) { + if ( TQString( p->name() ) == "alignment" ) { TQStringList lst; lst << p->valueToKey( AlignAuto ) << p->valueToKey( AlignLeft ) @@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i ) { if ( !editor->widget() ) return; - TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) { if ( !editor->widget() ) return; - TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3696,21 +3696,21 @@ void PropertyList::setPropertyValue( PropertyItem *i ) property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); + int align = editor->widget()->property( "alignment" ).toInt(); p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); align &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); ( (PropertyListItem*)i )->setCurrentItem( l.last() ); } else if ( i->name() == "vAlign" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); + int align = editor->widget()->property( "alignment" ).toInt(); p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); + int align = editor->widget()->property( "alignment" ).toInt(); if ( align & WordBreak ) i->setValue( TQVariant( TRUE, 0 ) ); else @@ -3769,7 +3769,7 @@ void PropertyList::resetProperty() PropertyItem *i = (PropertyItem*)currentItem(); if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) ) return; - TQString pn( i18n( "Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), i->value(), @@ -3876,7 +3876,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) mo = mo->superClass(); } - return i18n( "

TQWidget::%1

There is no documentation available for this property.

" ).tqarg( prop ); + return i18n( "

TQWidget::%1

There is no documentation available for this property.

" ).arg( prop ); } void PropertyList::readPropertyDocs() @@ -4190,7 +4190,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) wid = w; formwindow = fw; - setCaption( i18n( "Property Editor (%1)" ).tqarg( formwindow->name() ) ); + setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) ); listview->viewport()->setUpdatesEnabled( FALSE ); listview->setUpdatesEnabled( FALSE ); clear(); diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 0191aab6..9e5c8cef 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -129,7 +129,7 @@ private: bool open, changed; PropertyItem *property; TQString propertyName; - TQPtrList tqchildren; + TQPtrList children; TQColor backColor; TQPushButton *resetButton; @@ -376,7 +376,7 @@ class PropertyColorItem : public TQObject, public: PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ); + const TQString &propName, bool children ); ~PropertyColorItem(); virtual void createChildren(); diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 7ad33a50..e15b68c1 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -225,7 +225,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) // represent, but is clearly impossible to trigger... p = TQChar(basekey & 0xffff); } else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) { - p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1); + p = TQAccel::tr( "F%1" ).arg(basekey - TQt::Key_F1 + 1); } else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) { p.sprintf( "%c", basekey ); } else { @@ -1344,7 +1344,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) { const TQObjectList l = obj->childrenListObject(); if ( l.isEmpty() ) - return; // no tqchildren to save + return; // no children to save TQString closeTag; // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer @@ -1680,7 +1680,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant ts << makeIndent( indent ) << "" << endl; } break; case TQVariant::Cursor: - ts << makeIndent( indent ) << "" << value.toCursor().tqshape() << "" << endl; + ts << makeIndent( indent ) << "" << value.toCursor().shape() << "" << endl; break; case TQVariant::StringList: { TQStringList lst = value.toStringList(); @@ -1787,7 +1787,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" "The widget %2 could not be created." ). - tqarg( currFileName ).tqarg( className ) ); + arg( currFileName ).arg( className ) ); return 0; } if ( !mainContainerSet ) { @@ -2130,10 +2130,10 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay formwindow->insertWidget( spacer, pasting ); if ( tqlayout ) { if ( ::tqqt_cast(tqlayout) ) - ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); + ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, - spacer->tqalignment() ); + spacer->alignment() ); } return spacer; } @@ -2897,9 +2897,9 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) TQString s = ""; TQString m = ""; if ( !formwindow->spacingFunction().isEmpty() ) - s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() ); + s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() ); if ( !formwindow->marginFunction().isEmpty() ) - m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() ); + m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() ); ts << makeIndent( indent ) << "" << endl; } } diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h index 263b5f90..27a11a21 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui.h +++ b/kdevdesigner/designer/richtextfontdialog.ui.h @@ -11,7 +11,7 @@ void RichTextFontDialog::init() { TQFontDatabase *db = new TQFontDatabase(); - fontCombo->insertStringList( db->tqfamilies() ); + fontCombo->insertStringList( db->families() ); } void RichTextFontDialog::selectColor() diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index 5a9ae0e9..f9daaefc 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) sel->updateGeometry(); oldPressPos += ( p - pos() ); - formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) ); + formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) ); formWindow->sizePreview()->adjustSize(); TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), formWindow->sizePreview()->size() ); @@ -231,11 +231,11 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) return; formWindow->sizePreview()->hide(); - if ( geom != widget->tqgeometry() ) + if ( geom != widget->geometry() ) formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ), formWindow, widget, origGeom, - widget->tqgeometry() ) ); + widget->geometry() ) ); formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); } diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index ad76e201..b0061f24 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -138,7 +138,7 @@ bool SourceFile::saveAs( bool ignoreModified ) pro->setModified( TRUE ); timeStamp.setFileName( pro->makeAbsolute( filename ) ); if ( ed ) - ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) ); + ed->setCaption( i18n( "Edit %1" ).arg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { TQObject *o = ed->parent(); @@ -220,7 +220,7 @@ bool SourceFile::closeEvent() ed->save(); switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ), - i18n( "Save changes to '%1'?" ).tqarg( filename ), + i18n( "Save changes to '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) @@ -265,7 +265,7 @@ void SourceFile::checkTimeStamp() timeStamp.update(); if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), i18n( "File '%1' has been changed outside TQt Designer.\n" - "Do you want to reload it?" ).tqarg( filename ), + "Do you want to reload it?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { load(); if ( ed ) @@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak ) if ( sf ) TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a source file with \n" - "filename '%1'. Please choose a new filename." ).tqarg( filename ) ); + "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); TQString filter; diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index 9bf43f87..b6f62ad2 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item ) } TQDateTime dt( f.lastModified() ); TQString date( dt.toString( "MMMM dd hh:mm" )); - msg = TQString( "%1 (%2 %3) %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date); + msg = TQString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date); fileInfoLabel->setText( msg ); } diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp index baa6a9f5..5bb681f9 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.cpp +++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp @@ -46,7 +46,7 @@ SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML() { } -void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate ) +void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool invalidate ) { TQTextFormat *formatStandard = format( Standard ); @@ -131,7 +131,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri string->setEndState( state ); string->setFirstPreProcess( FALSE ); - if ( tqinvalidate && string->next() && + if ( invalidate && string->next() && !string->next()->firstPreProcess() && string->next()->endState() != -1 ) { TQTextParagraph *p = string->next(); while ( p ) { diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h index 87f94872..efd1a616 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.h +++ b/kdevdesigner/designer/syntaxhighlighter_html.h @@ -42,7 +42,7 @@ public: SyntaxHighlighter_HTML(); virtual ~SyntaxHighlighter_HTML(); - void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE ); + void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE ); TQTextFormat *format( int id ); private: diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 4f549a28..0013398c 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -343,7 +343,7 @@ void TableEditor::applyClicked() row.pix = table->verticalHeader()->iconSet( i )->pixmap(); rows.append( row ); } - PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ), + PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ), formWindow, editTable, rows, cols ); cmd->execute(); formWindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index e1f11546..11d7b5d9 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -1080,7 +1080,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) return 0; } -/*! Returns the widget into which tqchildren should be inserted when \a +/*! Returns the widget into which children should be inserted when \a w is a container known to the designer. Usually that is \a w itself, sometimes it is different (e.g. a @@ -1479,7 +1479,7 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) { if ( propName == "wordwrap" ) { - int v = defaultValue( w, "tqalignment" ).toInt(); + int v = defaultValue( w, "alignment" ).toInt(); return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); } else if ( propName == "toolTip" || propName == "whatsThis" ) { return TQVariant( TQString::fromLatin1( "" ) ); @@ -1499,7 +1499,7 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam const TQMetaProperty *p = w->metaObject()-> property( w->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { - int v = defaultValue( w, "tqalignment" ).toInt(); + int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { if ( ( v & AlignAuto ) == AlignAuto ) return "AlignAuto"; @@ -1721,7 +1721,7 @@ void TQLayoutWidget::updateSizePolicy() #endif // USE_QT4 vt = TQSizePolicy::Expanding; - tqlayout()->tqinvalidate(); + tqlayout()->invalidate(); } sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index 850cafef..5933793e 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -130,7 +130,7 @@ void WizardEditor::addClicked() listBox->insertItem( i18n( "Page" ), index ); // schedule add command - AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wizard->name() ), + AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ), formwindow, wizard, "Page", index, FALSE); commands.append( cmd ); @@ -149,7 +149,7 @@ void WizardEditor::removeClicked() // schedule remove command DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ) - .tqarg( listBox->text( index ) ).tqarg( wizard->name() ), + .arg( listBox->text( index ) ).arg( wizard->name() ), formwindow, wizard, index, FALSE ); commands.append( cmd ); @@ -169,8 +169,8 @@ void WizardEditor::upClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ) - .tqarg( wizard->name() ), formwindow, wizard, index1, index2); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ) + .arg( wizard->name() ), formwindow, wizard, index1, index2); commands.append( cmd ); // update buttons @@ -189,7 +189,7 @@ void WizardEditor::downClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ).tqarg( wizard->name() ), formwindow, wizard, index2, index1); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ).arg( wizard->name() ), formwindow, wizard, index2, index1); commands.append( cmd ); // update buttons @@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index ) if ( index < 0 ) return; // Called when TQt::Key_Enter was pressed. // ListBoxRename has renamed the list item, so we only need to rename the page to the same name. - TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) ); commands.append( cmd ); } @@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i ) int droppedItem = listBox->index( i ); //qDebug( "Moving page %d -> %d", draggedItem, droppedItem ); - MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); + MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); commands.append( cmd ); } diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 5f92b691..28514b22 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -419,9 +419,9 @@ void Workspace::update( FormFile* ff ) { TQListViewItem* i = findItem( ff ); if ( i ) { - i->tqrepaint(); + i->repaint(); if ( (i = i->firstChild()) ) - i->tqrepaint(); + i->repaint(); } } diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index d4645eaa..66cddfbb 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -474,7 +474,7 @@ static void outputLayoutWidgetsSubLayout( TQMap& buddies, cell and the correct name property, and put the Object_End marker back. */ - out.tqdevice()->at( out.tqdevice()->at() - 1 ); + out.device()->at( out.device()->at() - 1 ); outputGridCell( out, elem ); outputProperty( buddies, subLayoutNo, strings, out, nameElem ); out << (TQ_UINT8) Object_End; diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp index a38f859c..7072626a 100644 --- a/kdevdesigner/shared/uib.cpp +++ b/kdevdesigner/shared/uib.cpp @@ -31,7 +31,7 @@ static const char commonStrings[] = "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0" "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" - "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0" + "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0" "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" "toolTip\0unnamed\0whatsThis"; diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 9f2090f7..e6a6b05f 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const { if ( table[offset] == 0x7f ) { TQDataStream in( table, IO_ReadOnly ); - in.tqdevice()->at( offset + 1 ); + in.device()->at( offset + 1 ); TQString str; in >> str; return str; diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 80e8c131..a8c7803b 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id ) return r->isForm; } -/*! Returns whether the widget registered as \a id can have tqchildren. +/*! Returns whether the widget registered as \a id can have children. */ bool WidgetDatabase::isContainer( int id ) diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index 2ac6d22e..f2a326a3 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -1175,7 +1175,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ - ( in.atEnd() || in.tqdevice()->at() >= nextBlock ) + ( in.atEnd() || in.device()->at() >= nextBlock ) TQ_UINT8 lf; TQ_UINT8 cr; @@ -1204,7 +1204,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, in >> blockType; while ( !in.atEnd() && blockType != Block_End ) { unpackUInt32( in, blockSize ); - TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize; + TQIODevice::Offset nextBlock = in.device()->at() + blockSize; switch ( blockType ) { case Block_Actions: @@ -1258,7 +1258,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Functions: // ### qWarning( "Block_Functions not supported" ); - in.tqdevice()->at( nextBlock ); + in.device()->at( nextBlock ); break; case Block_Images: { @@ -1340,7 +1340,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Variables: // ### qWarning( "Block_Variables not supported" ); - in.tqdevice()->at( nextBlock ); + in.device()->at( nextBlock ); break; case Block_Widget: toplevel = (TQWidget *) @@ -2140,9 +2140,9 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( conn.slot.data() ); TQStrList signalList = sender->metaObject()->signalNames( TRUE ); TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); -- cgit v1.2.1