From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:34 -0600 Subject: Remove additional unneeded tq method conversions --- cervisia/annotatectl.cpp | 2 +- cervisia/cervisia.1.in | 8 +- cervisia/cervisia.pod | 6 +- cervisia/cervisiapart.cpp | 4 +- cervisia/diffdlg.cpp | 24 +-- cervisia/diffview.cpp | 2 +- cervisia/logdlg.cpp | 2 +- cervisia/logplainview.cpp | 6 +- cervisia/logtree.cpp | 2 +- cervisia/misc.cpp | 2 +- cervisia/protocolview.cpp | 6 +- cervisia/qttableview.cpp | 56 +++--- cervisia/qttableview.h | 14 +- cervisia/resolvedlg.cpp | 20 +- cervisia/settingsdlg.cpp | 2 +- cervisia/updateview_items.cpp | 4 +- cervisia/updateview_items.h | 2 +- cervisia/updateview_visitors.cpp | 2 +- kbabel/catalogmanager/catalogmanager.cpp | 6 +- kbabel/catalogmanager/catalogmanagerview.cpp | 76 ++++---- kbabel/catalogmanager/catalogmanagerview.h | 2 +- kbabel/catalogmanager/catmanlistitem.cpp | 20 +- kbabel/catalogmanager/catmanlistitem.h | 8 +- kbabel/catalogmanager/libcvs/cvsdialog.cpp | 18 +- kbabel/catalogmanager/libcvs/cvshandler.cpp | 2 +- kbabel/catalogmanager/libsvn/svndialog.cpp | 8 +- kbabel/catalogmanager/multiroughtransdlg.cpp | 18 +- kbabel/catalogmanager/validateprogress.cpp | 2 +- kbabel/catalogmanager/validateprogresswidget.ui.h | 2 +- kbabel/common/catalog.cpp | 4 +- kbabel/common/kbmailer.cpp | 6 +- kbabel/commonui/projectprefwidgets.cpp | 10 +- kbabel/commonui/projectwizard.cpp | 2 +- kbabel/commonui/roughtransdlg.cpp | 14 +- kbabel/datatools/regexp/main.cc | 2 +- kbabel/filters/gettext/gettextexport.cpp | 2 +- kbabel/filters/gettext/gettextimport.cpp | 10 +- kbabel/kbabel/contextview.cpp | 2 +- kbabel/kbabel/headereditor.cpp | 2 +- kbabel/kbabel/hidingmsgedit.cpp | 4 +- kbabel/kbabel/kbabel.cpp | 22 +-- kbabel/kbabel/kbabelsplash.cpp | 2 +- kbabel/kbabel/kbabelview.cpp | 70 +++---- kbabel/kbabel/kbabelview2.cpp | 16 +- kbabel/kbabel/kbbookmarkhandler.cpp | 2 +- kbabel/kbabel/kbcataloglistviewitem.cpp | 6 +- kbabel/kbabel/mymultilineedit.cpp | 10 +- kbabel/kbabel/mymultilineedit.h | 2 +- kbabel/kbabeldict/dictionarymenu.cpp | 4 +- kbabel/kbabeldict/kbabeldictbox.cpp | 10 +- kbabel/kbabeldict/kbabelsplash.cpp | 2 +- .../kbabeldict/modules/dbsearchengine/database.cpp | 12 +- .../kbabeldict/modules/dbsearchengine/dbscan.cpp | 4 +- .../modules/dbsearchengine/dbseprefwidget.ui | 2 +- .../modules/dbsearchengine/preferenceswidget.cpp | 4 +- .../kbabeldict/modules/dbsearchengine2/dbscan.cpp | 2 +- .../modules/dbsearchengine2/dbseprefwidget.ui | 2 +- .../kbabeldict/modules/poauxiliary/poauxiliary.cpp | 4 +- kbabel/kbabeldict/modules/poauxiliary/pwidget.ui | 2 +- .../modules/pocompendium/compendiumdata.cpp | 2 +- kbabel/kbabeldict/modules/pocompendium/pwidget.ui | 2 +- .../kbabeldict/modules/tmx/tmxcompendiumdata.cpp | 2 +- kbugbuster/backend/bugdetails.cpp | 2 +- kbugbuster/backend/bugdetailsjob.cpp | 4 +- kbugbuster/backend/buglistjob.cpp | 4 +- kbugbuster/backend/bugmybugsjob.cpp | 2 +- kbugbuster/backend/bugserver.cpp | 4 +- kbugbuster/backend/mailsender.cpp | 4 +- kbugbuster/backend/smtp.cpp | 4 +- kbugbuster/gui/buglvi.cpp | 2 +- kbugbuster/gui/centralwidget.cpp | 2 +- kbugbuster/gui/cwbugdetails.cpp | 38 ++-- kbugbuster/gui/cwbugdetailscontainer.cpp | 20 +- kbugbuster/gui/cwbuglistcontainer.cpp | 16 +- kbugbuster/gui/cwloadingwidget.cpp | 2 +- kbugbuster/gui/loadallbugsdlg.cpp | 4 +- kbugbuster/gui/messageeditor.cpp | 2 +- kbugbuster/gui/msginputdialog.cpp | 2 +- kbugbuster/kresources/kcalresource.cpp | 2 +- kcachegrind/converters/memprof2calltree | 4 +- kcachegrind/kcachegrind/cachegrindloader.cpp | 4 +- kcachegrind/kcachegrind/callgraphview.cpp | 90 ++++----- kcachegrind/kcachegrind/callitem.cpp | 4 +- kcachegrind/kcachegrind/callmapview.cpp | 36 ++-- kcachegrind/kcachegrind/callmapview.h | 6 +- kcachegrind/kcachegrind/callview.cpp | 4 +- kcachegrind/kcachegrind/configdlg.cpp | 2 +- kcachegrind/kcachegrind/configuration.cpp | 30 +-- kcachegrind/kcachegrind/costlistitem.cpp | 6 +- kcachegrind/kcachegrind/costtypeitem.cpp | 4 +- kcachegrind/kcachegrind/costtypeview.cpp | 6 +- kcachegrind/kcachegrind/coverage.cpp | 2 +- kcachegrind/kcachegrind/coverageitem.cpp | 24 +-- kcachegrind/kcachegrind/coverageview.cpp | 2 +- kcachegrind/kcachegrind/functionitem.cpp | 8 +- kcachegrind/kcachegrind/functionselection.cpp | 14 +- kcachegrind/kcachegrind/instritem.cpp | 20 +- kcachegrind/kcachegrind/instritem.h | 2 +- kcachegrind/kcachegrind/instrview.cpp | 10 +- kcachegrind/kcachegrind/multiview.cpp | 6 +- kcachegrind/kcachegrind/partgraph.cpp | 30 +-- kcachegrind/kcachegrind/partgraph.h | 6 +- kcachegrind/kcachegrind/partlistitem.cpp | 6 +- kcachegrind/kcachegrind/partselection.cpp | 8 +- kcachegrind/kcachegrind/partview.cpp | 4 +- kcachegrind/kcachegrind/sourceitem.cpp | 20 +- kcachegrind/kcachegrind/sourceitem.h | 2 +- kcachegrind/kcachegrind/sourceview.cpp | 16 +- kcachegrind/kcachegrind/stackitem.cpp | 4 +- kcachegrind/kcachegrind/tabview.cpp | 14 +- kcachegrind/kcachegrind/tabview.h | 2 +- kcachegrind/kcachegrind/toplevel.cpp | 72 +++---- kcachegrind/kcachegrind/tracedata.cpp | 216 ++++++++++----------- kcachegrind/kcachegrind/tracedata.h | 12 +- kcachegrind/kcachegrind/traceitemview.cpp | 2 +- kcachegrind/kcachegrind/treemap.cpp | 138 ++++++------- kcachegrind/kcachegrind/treemap.h | 24 +-- kioslave/svn/ksvnd/ksvnd.cpp | 2 +- kioslave/svn/ksvnd/ksvnd.h | 2 +- kioslave/svn/svn.cpp | 58 +++--- kompare/kompare_shell.cpp | 4 +- kompare/komparenavtreepart/komparenavtreepart.cpp | 2 +- kompare/komparepart/kompare_part.cpp | 30 +-- kompare/komparepart/kompareconnectwidget.cpp | 2 +- kompare/komparepart/komparelistview.cpp | 6 +- kompare/komparepart/komparesaveoptionsbase.ui | 2 +- kompare/komparepart/komparesplitter.cpp | 4 +- kompare/libdialogpages/pagebase.cpp | 2 +- kompare/libdiff2/diffhunk.cpp | 8 +- kompare/libdiff2/diffmodel.cpp | 4 +- kompare/libdiff2/komparemodellist.cpp | 12 +- kspy/propsview.cpp | 40 ++-- kspy/receiversview.cpp | 6 +- kspy/receiversview.h | 2 +- kspy/spy.cpp | 2 +- kuiviewer/kuiviewer.cpp | 2 +- kunittest/runnergui.cpp | 12 +- poxml/antlr/antlr/AST.hpp | 2 +- poxml/antlr/antlr/ASTFactory.hpp | 2 +- poxml/antlr/antlr/BaseAST.hpp | 4 +- poxml/antlr/src/ASTFactory.cpp | 6 +- poxml/antlr/src/BaseAST.cpp | 10 +- poxml/parser.cpp | 52 ++--- poxml/split.cpp | 2 +- scheck/scheck.cpp | 44 ++--- scripts/kde-emacs/kde-emacs-core.el | 2 +- scripts/kde-spellcheck.pl | 4 +- scripts/tdesvn-build | 2 +- umbrello/umbrello/aligntoolbar.cpp | 4 +- umbrello/umbrello/aligntoolbar.h | 8 +- umbrello/umbrello/associationwidget.cpp | 2 +- umbrello/umbrello/associationwidget.h | 2 +- umbrello/umbrello/autolayout/autolayoutdlg.cpp | 8 +- umbrello/umbrello/autolayout/autolayoutdlg.h | 2 +- .../umbrello/autolayout/autolayouteradapter.cpp | 2 +- umbrello/umbrello/autolayout/autolayouteradapter.h | 2 +- umbrello/umbrello/autolayout/graphvizgraph.cpp | 2 +- .../umbrello/autolayout/newautolayoutdialog.ui | 6 +- umbrello/umbrello/clipboard/umlclipboard.cpp | 6 +- umbrello/umbrello/clipboard/umlclipboard.h | 6 +- umbrello/umbrello/codegenerator.cpp | 2 +- umbrello/umbrello/codegenerators/cppwriter.cpp | 2 +- umbrello/umbrello/codegenerators/csharpwriter.cpp | 2 +- umbrello/umbrello/codegenerators/javawriter.cpp | 2 +- umbrello/umbrello/codegenerators/php5writer.cpp | 30 +-- umbrello/umbrello/codegenerators/phpwriter.cpp | 30 +-- .../umbrello/codegenerators/xmlschemawriter.cpp | 2 +- umbrello/umbrello/codegenerators/xmlschemawriter.h | 2 +- umbrello/umbrello/codegenobjectwithtextblocks.cpp | 4 +- umbrello/umbrello/codegenobjectwithtextblocks.h | 2 +- umbrello/umbrello/codeimport/classimport.cpp | 2 +- umbrello/umbrello/codeimport/import_utils.cpp | 2 +- umbrello/umbrello/codeimport/kdevcppparser/ast.cpp | 6 +- umbrello/umbrello/codeimport/kdevcppparser/ast.h | 4 +- .../codeimport/kdevcppparser/ast_utils.cpp | 4 +- .../umbrello/codeimport/kdevcppparser/lexer.cpp | 2 +- .../umbrello/codeimport/kdevcppparser/parser.cpp | 6 +- umbrello/umbrello/dialogs/classoptionspage.h | 2 +- umbrello/umbrello/dialogs/codegenerationwizard.cpp | 4 +- umbrello/umbrello/dialogs/diagramprintpage.cpp | 6 +- umbrello/umbrello/dialogs/overwritedialogue.cpp | 2 +- umbrello/umbrello/dialogs/umloperationdialog.cpp | 2 +- .../umbrello/docgenerators/docbookgenerator.cpp | 2 +- umbrello/umbrello/folder.cpp | 4 +- umbrello/umbrello/messagewidget.h | 2 +- umbrello/umbrello/notewidget.cpp | 2 +- umbrello/umbrello/notewidgetcontroller.h | 2 +- .../umbrello/refactoring/refactoringassistant.cpp | 4 +- umbrello/umbrello/uml.cpp | 6 +- umbrello/umbrello/uml.h | 2 +- umbrello/umbrello/umldoc.cpp | 34 ++-- umbrello/umbrello/umllistview.cpp | 6 +- umbrello/umbrello/umllistview.h | 2 +- umbrello/umbrello/umllistviewitem.cpp | 2 +- umbrello/umbrello/umllistviewitem.h | 4 +- umbrello/umbrello/umlobject.h | 2 +- umbrello/umbrello/umlview.cpp | 10 +- umbrello/umbrello/umlview.h | 4 +- umbrello/umbrello/umlviewimageexporter.cpp | 2 +- umbrello/umbrello/umlviewimageexportermodel.cpp | 10 +- umbrello/umbrello/umlwidget.h | 2 +- 201 files changed, 1073 insertions(+), 1073 deletions(-) diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp index 09d0cef0..1f220342 100644 --- a/cervisia/annotatectl.cpp +++ b/cervisia/annotatectl.cpp @@ -79,7 +79,7 @@ void AnnotateController::showDialog(const TQString& fileName, const TQString& re // hide progress dialog delete d->progress; d->progress = 0; - d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName)); + d->dialog->setCaption(i18n("CVS Annotate: %1").arg(fileName)); d->dialog->show(); } diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in index 3a0c720a..b60c2f3c 100644 --- a/cervisia/cervisia.1.in +++ b/cervisia/cervisia.1.in @@ -144,7 +144,7 @@ Cervisia \- Graphical CVS frontend [\ \fB\-\-nocrashhandler\fR\ ] [\ \fB\-\-waitforwm\fR\ ] [\ \fB\-\-style\fR\ \fIstyle\fR\ ] - [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\fR\ ] + [\ \fB\-\-geometry\fR\ \fIgeometry\fR\ ] [\ \fB\-\-resolve\fR\ \fIfilename\fR\ ] [\ \fB\-\-log\fR\ \fIfilename\fR\ ] [\ \fB\-\-annotate\fR\ \fIfilename\fR\ ] @@ -193,9 +193,9 @@ Waits for a \s-1WM_NET\s0 compatible windowmanager .IP "\fB\-\-style\fR \fIstyle\fR" 4 .IX Item "--style style" Sets the application \s-1GUI\s0 style -.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4 -.IX Item "--tqgeometry tqgeometry" -Sets the tqgeometry of the main window +.IP "\fB\-\-geometry\fR \fIgeometry\fR" 4 +.IX Item "--geometry geometry" +Sets the geometry of the main window .SH "FILES" .IX Header "FILES" \&\fI_KDECONFDIR_/cervisiarc\fR \- global configuration file diff --git a/cervisia/cervisia.pod b/cervisia/cervisia.pod index 75ea6b27..940ba8e0 100644 --- a/cervisia/cervisia.pod +++ b/cervisia/cervisia.pod @@ -14,7 +14,7 @@ B S<[ B<--nocrashhandler> ]> S<[ B<--waitforwm> ]> S<[ B<--style> I\n" ) - .tqarg( cg.highlight().name() ) - .tqarg( cg.highlightedText().name() ) ); + .arg( cg.highlight().name() ) + .arg( cg.highlightedText().name() ) ); text.append( "\n" ); TQString highlightStyle = TQString( "background: %1; color: %2; " ) - .tqarg( cg.highlight().name() ) - .tqarg( cg.highlightedText().name() ); + .arg( cg.highlight().name() ) + .arg( cg.highlightedText().name() ); TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " ) - .tqarg( cg.foreground().name() ); + .arg( cg.foreground().name() ); TQString borderTopStyle = TQString( "border-top: solid %1 1px; " ) - .tqarg( cg.foreground().name() ); + .arg( cg.foreground().name() ); TQString submitter = bug.submitter().fullName( true ); int age = details.age(); text.append( "
" ); text.append( "server()->bugLink( bug ).url() + "\">" + i18n("Bug Report from %1 " ) - .tqarg( submitter ) ); + .arg( submitter ) ); int replies = details.parts().count() - 1; if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies ); text += "
"; @@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "border-bottom: solid %3 1px; " "padding: 4px\">" "" ) - .tqarg( cg.background().name() ) - .tqarg( cg.foreground().name() ) ); + .arg( cg.background().name() ) + .arg( cg.foreground().name() ) ); text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) ); text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) ); text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) ); @@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( ++it2 == bdp.end() ) text.append( "server()->bugLink( bug ).url() + "\">" + i18n("Bug Report from %1") - .tqarg( sender ) ); + .arg( sender ) ); else { - text.append( "server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies ) + text.append( "server()->bugLink( bug ).url() + TQString("#c%1").arg( replies ) + "\">" + i18n("Reply #%1 from %2") - .tqarg( replies ).tqarg( sender ) ); + .arg( replies ).arg( sender ) ); replies--; } text.append( "\n" ); @@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( atts.count() > 0 ) { text.append( "
" ); text.append( TQString( "") - .tqarg( i18n( "Attachment List") ) ); + .arg( i18n( "Attachment List") ) ); text.append( TQString("") - .tqarg( i18n("Description") ) - .tqarg( i18n("Date") ) - .tqarg( i18n("View") ) - .tqarg( i18n("Edit") ) ); + .arg( i18n("Description") ) + .arg( i18n("Date") ) + .arg( i18n("View") ) + .arg( i18n("Edit") ) ); TQValueList::iterator it; for ( it = atts.begin() ; it != atts.end() ; ++it ) { - text.append( TQString("").tqarg( (*it).description ) ) ; - text.append( TQString("").tqarg( (*it).date ) ); + text.append( TQString("").arg( (*it).description ) ) ; + text.append( TQString("").arg( (*it).date ) ); text.append( "" ); diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index ef8fc8ef..7b57ec1b 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details ) list.truncate( list.length()-2 ); //Strip off the last ", " labelText = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4") - .tqarg( bug.number() ) - .tqarg( list ) - .tqarg( bug.severityAsString() ) - .tqarg( bug.title() ); + .arg( bug.number() ) + .arg( list ) + .arg( bug.severityAsString() ) + .arg( bug.title() ); } else { labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3") - .tqarg( bug.number() ).tqarg( bug.severityAsString() ) - .tqarg( bug.title() ); + .arg( bug.number() ).arg( bug.severityAsString() ) + .arg( bug.title() ); } m_bugLabel->setText( KStringHandler::tagURLs( labelText ) ); @@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug ) if (!first) cmdText += " | "; // separator in case of multiple commands first = false; - cmdText += TQString("%1").tqarg( cmd->name() ); + cmdText += TQString("%1").arg( cmd->name() ); if (!cmdDetails.isEmpty()) cmdDetails += " | "; // separator in case of multiple commands cmdDetails += cmd->details(); @@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug ) showCommands( bug ); m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" ) - .tqarg( bug.number() ).tqarg( bug.title() ) ); + .arg( bug.number() ).arg( bug.title() ) ); m_bugStack->raiseWidget( 1 ); } @@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug ) TQString msg; if( BugSystem::self()->disconnected() ) msg = i18n( "Bug #%1 (%2) is not available offline." ). - tqarg( bug.number() ).tqarg( bug.title() ); + arg( bug.number() ).arg( bug.title() ); else msg = i18n( "Retrieving details for bug #%1\n" "(%2)" ). - tqarg( bug.number() ).tqarg( bug.title() ); + arg( bug.number() ).arg( bug.title() ); m_bugLoading->setText( msg ); m_bugStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 98124dda..14a601be 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug } } - m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) ); + m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) ); m_listStack->raiseWidget( 0 ); } @@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com if ( component.isEmpty() ) { if ( package.components().count() > 1 ) - listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() ); + listLabel = i18n( "Product '%1', all components" ).arg( package.name() ); else - listLabel = i18n( "Product '%1'" ).tqarg( package.name() ); + listLabel = i18n( "Product '%1'" ).arg( package.name() ); } else { - listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component ); + listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component ); } setBugList( listLabel, bugs ); @@ -208,9 +208,9 @@ void CWBugListContainer::setNoList() void CWBugListContainer::setLoading( const Package &package, const TQString &component ) { if ( component.isEmpty() ) - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) ); else - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) ); } void CWBugListContainer::setLoading( const TQString &label ) @@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label ) void CWBugListContainer::setCacheMiss( const Package &package ) { - setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) ); + setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) ); } void CWBugListContainer::setCacheMiss( const TQString &label ) { - m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) ); + m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) ); m_listStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index 6e8a9852..f2a62573 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text ) { m_text = text; updatePixmap(); - tqrepaint(); + repaint(); } void CWLoadingWidget::updatePixmap() diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index 72212ccd..d6203c07 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) m_bugLoadingProgress = new KIO::DefaultProgress( this ); connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotStopped() ) ); - setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) ); + setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) ); connect( BugSystem::self(), TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); @@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & ) { kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl; - m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) ); + m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) ); loadNextBug(); } diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index 54d56ea6..29da4b12 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -79,7 +79,7 @@ void MessageEditor::addButton() void MessageEditor::removeButton() { int result = KMessageBox::warningContinueCancel(this, - i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()), + i18n("Remove the button %1?").arg(mSelectionCombo->currentText()), i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") ); if (result == KMessageBox::Continue) { diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 388a02df..5f9d0e1a 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, { switch ( mType ) { case Close: - setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) ); + setCaption( i18n("Close Bug %1").arg( mBug.number() ) ); break; case Reply: setCaption( i18n("Reply to Bug") ); diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index dd858f18..5af8b8be 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/kresources/kcalresource.cpp @@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &, newTodo = new KCal::Todo; newTodo->setUid( uid ); TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1"; - newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) ); + newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) ); todo = newTodo; } diff --git a/kcachegrind/converters/memprof2calltree b/kcachegrind/converters/memprof2calltree index a04eaa38..e82d6e85 100755 --- a/kcachegrind/converters/memprof2calltree +++ b/kcachegrind/converters/memprof2calltree @@ -13,8 +13,8 @@ while(<>) { print "\nfn=$1\n"; next; } - if (/^ tqchildren:/) { - $next = 1; #tqchildren + if (/^ children:/) { + $next = 1; #children next; } if (/^ inherited:/) { diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp index 64483512..4fe57d34 100644 --- a/kcachegrind/kcachegrind/cachegrindloader.cpp +++ b/kcachegrind/kcachegrind/cachegrindloader.cpp @@ -735,7 +735,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) return false; } kdDebug() << "Loading " << _filename << " ..." << endl; - TQString statusMsg = i18n("Loading %1").tqarg(_filename); + TQString statusMsg = i18n("Loading %1").arg(_filename); int statusProgress = 0; emit updateStatus(statusMsg,statusProgress); @@ -1310,7 +1310,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) emit updateStatus(statusMsg,100); - _part->tqinvalidate(); + _part->invalidate(); if (!totalsSet) { _part->totals()->clear(); _part->totals()->addCost(_part); diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index f9ebb10c..b02d441a 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -303,8 +303,8 @@ GraphEdge::GraphEdge() TQString GraphEdge::prettyName() { if (_c) return _c->prettyName(); - if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName()); - if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName()); + if (_from) return i18n("Call(s) from %1").arg(_from->prettyName()); + if (_to) return i18n("Call(s) to %1").arg(_to->prettyName()); return i18n("(unknown call)"); } @@ -579,7 +579,7 @@ void GraphExporter::writeDot() break; } if (f) - *stream << TQString(" center=F%1;\n").tqarg((long)f, 0, 16); + *stream << TQString(" center=F%1;\n").arg((long)f, 0, 16); *stream << TQString(" overlap=false;\n splines=true;\n"); } @@ -619,7 +619,7 @@ void GraphExporter::writeDot() iabr = iabr.left(Configuration::maxSymbolLength()) + "..."; *stream << TQString("subgraph \"cluster%1\" { label=\"%2\";\n") - .tqarg(cluster).tqarg(iabr); + .arg(cluster).arg(iabr); } GraphNode* np; @@ -630,17 +630,17 @@ void GraphExporter::writeDot() if ((int)abr.length() > Configuration::maxSymbolLength()) abr = abr.left(Configuration::maxSymbolLength()) + "..."; - *stream << TQString(" F%1 [").tqarg((long)f, 0, 16); + *stream << TQString(" F%1 [").arg((long)f, 0, 16); if (_useBox) { // make label 3 lines for CallGraphView - *stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n") - .tqarg(abr) - .tqarg(SubCost(np->incl).pretty()); + *stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n") + .arg(abr) + .arg(SubCost(np->incl).pretty()); } else *stream << TQString("label=\"%1\\n%2\"];\n") - .tqarg(abr) - .tqarg(SubCost(np->incl).pretty()); + .arg(abr) + .arg(SubCost(np->incl).pretty()); } if (_go->clusterGroups() && i) @@ -675,17 +675,17 @@ void GraphExporter::writeDot() to.callerSet.remove(&e); *stream << TQString(" F%1 -> F%2 [weight=%3") - .tqarg((long)e.from(), 0, 16) - .tqarg((long)e.to(), 0, 16) - .tqarg((long)log(log(e.cost))); + .arg((long)e.from(), 0, 16) + .arg((long)e.to(), 0, 16) + .arg((long)log(log(e.cost))); if (_go->detailLevel() ==1) *stream << TQString(",label=\"%1\"") - .tqarg(SubCost(e.cost).pretty()); + .arg(SubCost(e.cost).pretty()); else if (_go->detailLevel() ==2) *stream << TQString(",label=\"%3\\n%4 x\"") - .tqarg(SubCost(e.cost).pretty()) - .tqarg(SubCost(e.count).pretty()); + .arg(SubCost(e.cost).pretty()) + .arg(SubCost(e.count).pretty()); *stream << TQString("];\n"); } @@ -713,14 +713,14 @@ void GraphExporter::writeDot() e->cost = costSum; e->count = countSum; - *stream << TQString(" R%1 [tqshape=point,label=\"\"];\n") - .tqarg((long)n.function(), 0, 16); + *stream << TQString(" R%1 [shape=point,label=\"\"];\n") + .arg((long)n.function(), 0, 16); *stream << TQString(" R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .tqarg((long)n.function(), 0, 16) - .tqarg((long)n.function(), 0, 16) - .tqarg(SubCost(costSum).pretty()) - .tqarg(SubCost(countSum).pretty()) - .tqarg((int)log(costSum)); + .arg((long)n.function(), 0, 16) + .arg((long)n.function(), 0, 16) + .arg(SubCost(costSum).pretty()) + .arg(SubCost(countSum).pretty()) + .arg((int)log(costSum)); } costSum = countSum = 0.0; @@ -736,14 +736,14 @@ void GraphExporter::writeDot() e->cost = costSum; e->count = countSum; - *stream << TQString(" S%1 [tqshape=point,label=\"\"];\n") - .tqarg((long)n.function(), 0, 16); + *stream << TQString(" S%1 [shape=point,label=\"\"];\n") + .arg((long)n.function(), 0, 16); *stream << TQString(" F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .tqarg((long)n.function(), 0, 16) - .tqarg((long)n.function(), 0, 16) - .tqarg(SubCost(costSum).pretty()) - .tqarg(SubCost(countSum).pretty()) - .tqarg((int)log(costSum)); + .arg((long)n.function(), 0, 16) + .arg((long)n.function(), 0, 16) + .arg(SubCost(costSum).pretty()) + .arg(SubCost(countSum).pretty()) + .arg((int)log(costSum)); } } } @@ -1062,7 +1062,7 @@ CanvasNode::CanvasNode(CallGraphView* v, GraphNode* n, double inclP = 100.0 * n->incl / total; if (_view->topLevel()->showPercentage()) setText(1, TQString("%1 %") - .tqarg(inclP, 0, 'f', Configuration::percentPrecision())); + .arg(inclP, 0, 'f', Configuration::percentPrecision())); else setText(1, SubCost(n->incl).pretty()); setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true)); @@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, if (!e) return; setPosition(1, DrawParams::TopCenter); - setText(1, TQString("%1 x").tqarg(SubCost(e->count).pretty())); + setText(1, TQString("%1 x").arg(SubCost(e->count).pretty())); setPosition(0, DrawParams::BottomCenter); @@ -1142,7 +1142,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, double inclP = 100.0 * e->cost / total; if (_view->topLevel()->showPercentage()) setText(0, TQString("%1 %") - .tqarg(inclP, 0, 'f', Configuration::percentPrecision())); + .arg(inclP, 0, 'f', Configuration::percentPrecision())); else setText(0, SubCost(e->cost).pretty()); setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true)); @@ -1331,7 +1331,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) if (0) qDebug("CallGraphTip: Mouse on Node '%s'", n->function()->prettyName().ascii()); - TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(cn->text(1)); + TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1)); TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); tip(TQRect(vPosTL, vPosBR), tipStr); @@ -1356,7 +1356,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) tipStr = e->prettyName(); else tipStr = TQString("%1 (%2)") - .tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1)); + .arg(ce->label()->text(0)).arg(ce->label()->text(1)); tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr); } } @@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType) } if (changeType & dataChanged) { - // tqinvalidate old selection and graph part + // invalidate old selection and graph part _exporter.reset(_data, _activeItem, _costType, _groupType); _selectedNode = 0; _selectedEdge = 0; @@ -1792,8 +1792,8 @@ void CallGraphView::showRenderWarning() s = i18n("Layouting stopped.\n"); s.append(i18n("The call graph has %1 nodes and %2 edges.\n") - .tqarg(_exporter.nodeCount()) - .tqarg(_exporter.edgeCount())); + .arg(_exporter.nodeCount()) + .arg(_exporter.edgeCount())); showText(s); } @@ -1866,7 +1866,7 @@ void CallGraphView::refresh() if ( !_renderProcess->start() ) { TQString e = i18n("No call graph is available because the following\n" "command cannot be run:\n'%1'\n") - .tqarg(_renderProcess->arguments().join(" ")); + .arg(_renderProcess->arguments().join(" ")); e += i18n("Please check that 'dot' is installed (package GraphViz)."); showText(e); @@ -2206,7 +2206,7 @@ void CallGraphView::dotExited() TQString s = i18n("There is no call graph available for function\n" "\t'%1'\n" "because it has no cost of the selected event type."); - TQCanvasText* t = new TQCanvasText(s.tqarg(_activeItem->name()), _canvas); + TQCanvasText* t = new TQCanvasText(s.arg(_activeItem->name()), _canvas); // t->setTextFlags(TQt::AlignHCenter | TQt::AlignVCenter); t->move(5,5); t->show(); @@ -2394,10 +2394,10 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) TQString name = f->prettyName(); popup.insertItem(i18n("Go to '%1'") - .tqarg(Configuration::shortenSymbol(name)), 93); + .arg(Configuration::shortenSymbol(name)), 93); if (cycle && (cycle != f)) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").tqarg(name), 94); + popup.insertItem(i18n("Go to '%1'").arg(name), 94); } popup.insertSeparator(); } @@ -2416,7 +2416,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) if (c) { TQString name = c->prettyName(); popup.insertItem(i18n("Go to '%1'") - .tqarg(Configuration::shortenSymbol(name)), 95); + .arg(Configuration::shortenSymbol(name)), 95); popup.insertSeparator(); } @@ -2457,7 +2457,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) case 10: gpopup1.setItemChecked(104,true); break; case 15: gpopup1.setItemChecked(105,true); break; default: - gpopup1.insertItem(i18n("< %1").tqarg(_maxCallerDepth), 106); + gpopup1.insertItem(i18n("< %1").arg(_maxCallerDepth), 106); gpopup1.setItemChecked(106,true); break; } @@ -2480,7 +2480,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) case 10: gpopup2.setItemChecked(114,true); break; case 15: gpopup2.setItemChecked(115,true); break; default: - gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116); + gpopup2.insertItem(i18n("< %1").arg(_maxCallingDepth), 116); gpopup2.setItemChecked(116,true); break; } diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp index 3a3a7266..ebca4903 100644 --- a/kcachegrind/kcachegrind/callitem.cpp +++ b/kcachegrind/kcachegrind/callitem.cpp @@ -110,7 +110,7 @@ void CallItem::updateCost() if (_view->topLevel()->showPercentage()) setText(0, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); else setText(0, _call->prettySubCost(ct)); @@ -134,7 +134,7 @@ void CallItem::updateCost() if (_view->topLevel()->showPercentage()) setText(1, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp index 7aa6db40..0e4d5e38 100644 --- a/kcachegrind/kcachegrind/callmapview.cpp +++ b/kcachegrind/kcachegrind/callmapview.cpp @@ -115,12 +115,12 @@ TQString CallMapView::whatsThis() const "choose 'Hide incorrect borders'. As this mode can be " "very time consuming, you may want to limit " "the maximum drawn nesting level before. " - "'Best' determinates the split direction for tqchildren " + "'Best' determinates the split direction for children " "from the aspect ratio of the parent. " "'Always Best' decides on remaining space for each " "sibling. " "'Ignore Proportions' takes space for function name " - "drawing before drawing tqchildren. Note that " + "drawing before drawing children. Note that " "size proportions can get heavily wrong.

" "

This is a TreeMap widget. " @@ -196,13 +196,13 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) if (i) { l1popup.insertSeparator(); l1popup.insertItem(i18n("Depth of '%1' (%2)") - .tqarg(shortCurrentName).tqarg(i->depth()), 55); + .arg(shortCurrentName).arg(i->depth()), 55); l1popup.setItemChecked(55, maxDepth == i->depth()); } if (maxDepth>0) { l1popup.insertSeparator(); - l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56); - l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(maxDepth+1), 57); + l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56); + l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57); } l2popup.setCheckable(true); @@ -256,15 +256,15 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) currentArea = i->width() * i->height(); l3popup.insertSeparator(); l3popup.insertItem(i18n("Area of '%1' (%2)") - .tqarg(shortCurrentName).tqarg(currentArea), 67); + .arg(shortCurrentName).arg(currentArea), 67); l3popup.setItemChecked(67, mArea == currentArea); } if (mArea>0) { l3popup.insertSeparator(); l3popup.insertItem(i18n("Double Area Limit (to %1)") - .tqarg(mArea*2), 68); + .arg(mArea*2), 68); l3popup.insertItem(i18n("Half Area Limit (to %1)") - .tqarg(mArea/2), 69); + .arg(mArea/2), 69); } popup.insertSeparator(); @@ -428,7 +428,7 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd) if (item->text(0).isEmpty()) return; if (kbd) { - TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0)); + TQString msg = i18n("Call Map: Current is '%1'").arg(item->text(0)); if (_topLevel) _topLevel->showMessage(msg, 5000); } @@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const sum = 100.0 * _f->inclusive()->subCost(ct) / total; return TQString("%1 %") - .tqarg(sum, 0, 'f', Configuration::percentPrecision()); + .arg(sum, 0, 'f', Configuration::percentPrecision()); } return _f->inclusive()->prettySubCost(ct); } @@ -663,7 +663,7 @@ bool CallMapBaseItem::isMarked(int) const return ((CallMapView*)widget())->selectedItem() == _f; } -TreeMapItemList* CallMapBaseItem::tqchildren() +TreeMapItemList* CallMapBaseItem::children() { if (_f && !initialized()) { CallMapView* w = (CallMapView*)widget(); @@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::tqchildren() setSorting(-2, false); } - return _tqchildren; + return _children; } TQColor CallMapBaseItem::backColor() const @@ -756,7 +756,7 @@ TQString CallMapCallingItem::text(int textNo) const TraceCost* t = ((CallMapView*)widget())->totalCost(); double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct); return TQString("%1 %") - .tqarg(p, 0, 'f', Configuration::percentPrecision()); + .arg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const } -TreeMapItemList* CallMapCallingItem::tqchildren() +TreeMapItemList* CallMapCallingItem::children() { if (!initialized()) { if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii()); @@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::tqchildren() setSorting(-2, false); } - return _tqchildren; + return _children; } @@ -872,7 +872,7 @@ TQString CallMapCallerItem::text(int textNo) const TraceCost* t = ((CallMapView*)widget())->totalCost(); double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct); return TQString("%1 %") - .tqarg(p, 0, 'f', Configuration::percentPrecision()); + .arg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const } -TreeMapItemList* CallMapCallerItem::tqchildren() +TreeMapItemList* CallMapCallerItem::children() { if (!initialized()) { //qDebug("Create Caller subitems (%s)", name().ascii()); @@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::tqchildren() setSorting(-2, false); } - return _tqchildren; + return _children; } TQColor CallMapCallerItem::backColor() const diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h index 1ee45258..860743fe 100644 --- a/kcachegrind/kcachegrind/callmapview.h +++ b/kcachegrind/kcachegrind/callmapview.h @@ -78,7 +78,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: @@ -99,7 +99,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: @@ -118,7 +118,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp index 2eb08f68..317d137b 100644 --- a/kcachegrind/kcachegrind/callview.cpp +++ b/kcachegrind/kcachegrind/callview.cpp @@ -121,11 +121,11 @@ void CallView::context(TQListViewItem* i, const TQPoint & p, int col) cycle = f->cycle(); popup.insertItem(i18n("Go to '%1'") - .tqarg(Configuration::shortenSymbol(name)), 93); + .arg(Configuration::shortenSymbol(name)), 93); if (cycle) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").tqarg(name), 94); + popup.insertItem(i18n("Go to '%1'").arg(name), 94); } popup.insertSeparator(); diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp index 7e56c686..e0b45470 100644 --- a/kcachegrind/kcachegrind/configdlg.cpp +++ b/kcachegrind/kcachegrind/configdlg.cpp @@ -210,7 +210,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p) TQMessageBox::warning(p, i18n("KCachegrind Configuration"), i18n("The Maximum Number of List Items should be below 500." "The previous set value (%1) will still be used.") - .tqarg(TQString::number(c->_maxListCount)), + .arg(TQString::number(c->_maxListCount)), TQMessageBox::Ok, 0); c->_maxSymbolCount = dlg.symbolCount->text().toInt(); diff --git a/kcachegrind/kcachegrind/configuration.cpp b/kcachegrind/kcachegrind/configuration.cpp index 66abd563..02d5c096 100644 --- a/kcachegrind/kcachegrind/configuration.cpp +++ b/kcachegrind/kcachegrind/configuration.cpp @@ -132,9 +132,9 @@ void Configuration::saveOptions(KConfig* kconfig) int count = 1; for( ; it.current(); ++it ) { if ( !(*it)->automatic ) { - colorConfig.writeEntry( TQString("Name%1").tqarg(count), + colorConfig.writeEntry( TQString("Name%1").arg(count), it.currentKey()); - colorConfig.writeEntry( TQString("Color%1").tqarg(count), + colorConfig.writeEntry( TQString("Color%1").arg(count), (*it)->color); //qDebug("Written Color %s (%d)", it.currentKey().ascii(), count); @@ -149,9 +149,9 @@ void Configuration::saveOptions(KConfig* kconfig) TQDictIterator it2( c->_objectSourceDirs ); count = 1; for( ; it2.current(); ++it2 ) { - sourceConfig.writeEntry( TQString("Object%1").tqarg(count), + sourceConfig.writeEntry( TQString("Object%1").arg(count), it2.currentKey()); - sourceConfig.writeEntry( TQString("Dirs%1").tqarg(count), + sourceConfig.writeEntry( TQString("Dirs%1").arg(count), *(*it2), ':'); count++; } @@ -176,15 +176,15 @@ void Configuration::saveOptions(KConfig* kconfig) ctConfig.writeEntry( "Count", ctCount); for (int i=0; iname()); + ctConfig.writeEntry( TQString("Name%1").arg(i+1), t->name()); // Use localized key TraceItemView::writeConfigEntry(&ctConfig, - TQString("Longname%1").tqarg(i+1).ascii(), + TQString("Longname%1").arg(i+1).ascii(), t->longName(), knownLongName(t->name()).utf8().data() /*, true */ ); TraceItemView::writeConfigEntry(&ctConfig, - TQString("Formula%1").tqarg(i+1).ascii(), + TQString("Formula%1").arg(i+1).ascii(), t->formula(), knownFormula(t->name()).utf8().data()); } } @@ -217,8 +217,8 @@ void Configuration::readOptions(KConfig* kconfig) KConfigGroup colorConfig(kconfig, TQCString("CostColors")); count = colorConfig.readNumEntry("Count", 0); for (i=1;i<=count;i++) { - TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i)); - TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(i)); + TQString n = colorConfig.readEntry(TQString("Name%1").arg(i)); + TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i)); if (n.isEmpty()) continue; @@ -241,8 +241,8 @@ void Configuration::readOptions(KConfig* kconfig) c->_objectSourceDirs.clear(); if (count>17) c->_objectSourceDirs.resize(count); for (i=1;i<=count;i++) { - TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i)); - dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(i), ':'); + TQString n = sourceConfig.readEntry(TQString("Object%1").arg(i)); + dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':'); if (n.isEmpty() || (dirs.count()==0)) continue; @@ -271,10 +271,10 @@ void Configuration::readOptions(KConfig* kconfig) int ctCount = ctConfig.readNumEntry("Count", 0); if (ctCount>0) { for (int i=1;i<=ctCount;i++) { - TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i)); - TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i)); + TQString n = ctConfig.readEntry(TQString("Name%1").arg(i)); + TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i)); if (l.isEmpty()) l = knownLongName(n); - TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(i)); + TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i)); if (f.isEmpty()) f = knownFormula(n); TraceCostType::add(new TraceCostType(n, l, f)); @@ -316,7 +316,7 @@ TQColor Configuration::costTypeColor(TraceCostType* t) if (!t) n = TQString("CostType-default"); else - n = TQString("CostType-%1").tqarg(t->name()); + n = TQString("CostType-%1").arg(t->name()); return color(n)->color; } diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp index 3129838a..1e777b05 100644 --- a/kcachegrind/kcachegrind/costlistitem.cpp +++ b/kcachegrind/kcachegrind/costlistitem.cpp @@ -71,7 +71,7 @@ void CostListItem::updateName() if (!_costItem) return; TQString n = _costItem->prettyName(); - if (_groupSize>=0) n += TQString(" (%1)").tqarg(_groupSize); + if (_groupSize>=0) n += TQString(" (%1)").arg(_groupSize); setText(1, n); } @@ -98,13 +98,13 @@ void CostListItem::update() double pure = 100.0 * _pure / total; TQString str; if (Configuration::showPercentage()) - str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").arg(pure, 0, 'f', Configuration::percentPrecision()); else str = _costItem->prettySubCost(_costType); if (_skipped) { // special handling for skip entries... - setText(0, TQString("< %1").tqarg(str)); + setText(0, TQString("< %1").arg(str)); return; } diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp index df5bf35a..dc35cb2b 100644 --- a/kcachegrind/kcachegrind/costtypeitem.cpp +++ b/kcachegrind/kcachegrind/costtypeitem.cpp @@ -104,7 +104,7 @@ void CostTypeItem::update() double pure = 100.0 * _pure / selfTotal; if (Configuration::showPercentage()) { setText(2, TQString("%1") - .tqarg(pure, 0, 'f', Configuration::percentPrecision())); + .arg(pure, 0, 'f', Configuration::percentPrecision())); } else setText(2, _costItem->prettySubCost(_costType)); @@ -121,7 +121,7 @@ void CostTypeItem::update() double sum = 100.0 * _sum / total; if (Configuration::showPercentage()) { setText(1, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp index d4087eba..3f5417e9 100644 --- a/kcachegrind/kcachegrind/costtypeview.cpp +++ b/kcachegrind/kcachegrind/costtypeview.cpp @@ -146,13 +146,13 @@ void CostTypeView::context(TQListViewItem* i, const TQPoint & p, int) else if (r == 97) { int i = 1; while(1) { - if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i))) + if (!TraceCostType::knownVirtualType(i18n("New%1").arg(i))) break; i++; } // add same new cost type to this mapping and to known types - TQString shortName = i18n("New%1").tqarg(i); - TQString longName = i18n("New Cost Type %1").tqarg(i); + TQString shortName = i18n("New%1").arg(i); + TQString longName = i18n("New Cost Type %1").arg(i); TraceCostType::add(new TraceCostType(shortName, longName, "0")); _data->mapping()->add(new TraceCostType(shortName, longName, "0")); refresh(); diff --git a/kcachegrind/kcachegrind/coverage.cpp b/kcachegrind/kcachegrind/coverage.cpp index dc4a9764..86e6f7ff 100644 --- a/kcachegrind/kcachegrind/coverage.cpp +++ b/kcachegrind/kcachegrind/coverage.cpp @@ -81,7 +81,7 @@ int Coverage::selfMedian() TraceFunctionList Coverage::coverage(TraceFunction* f, CoverageMode m, TraceCostType* ct) { - tqinvalidate(f->data(), Coverage::Rtti); + invalidate(f->data(), Coverage::Rtti); _costType = ct; diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp index 569359a8..26e5b36e 100644 --- a/kcachegrind/kcachegrind/coverageitem.cpp +++ b/kcachegrind/kcachegrind/coverageitem.cpp @@ -97,12 +97,12 @@ void CallerCoverageItem::update() _sum = SubCost(realSum * _coverage->inclusive()); TQString str; if (Configuration::showPercentage()) - str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - setText(0, TQString("< %1").tqarg(str)); + setText(0, TQString("< %1").arg(str)); return; } @@ -121,9 +121,9 @@ void CallerCoverageItem::update() distString = TQString::number(_distance); else distString = TQString("%1-%2 (%3)") - .tqarg(_coverage->minDistance()) - .tqarg(_coverage->maxDistance()) - .tqarg(_distance); + .arg(_coverage->minDistance()) + .arg(_coverage->maxDistance()) + .arg(_distance); setText(1, distString); } @@ -242,12 +242,12 @@ void CalleeCoverageItem::update() TQString str; if (Configuration::showPercentage()) - str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - str = TQString("< %1").tqarg(str); + str = TQString("< %1").arg(str); setText(0, str); setText(1, str); return; @@ -259,7 +259,7 @@ void CalleeCoverageItem::update() if (Configuration::showPercentage()) { setText(1, TQString("%1") - .tqarg(_pSelf, 0, 'f', Configuration::percentPrecision())); + .arg(_pSelf, 0, 'f', Configuration::percentPrecision())); } else { setText(1, _self.pretty()); @@ -285,12 +285,12 @@ void CalleeCoverageItem::update() if (_distance == sMed) med = TQString::number(_distance); else - med = TQString("%1/%2").tqarg(_distance).tqarg(sMed); + med = TQString("%1/%2").arg(_distance).arg(sMed); distString = TQString("%1-%2 (%3)") - .tqarg(_coverage->minDistance()) - .tqarg(_coverage->maxDistance()) - .tqarg(med); + .arg(_coverage->minDistance()) + .arg(_coverage->maxDistance()) + .arg(med); } setText(2, distString); } diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp index 6243d8af..6657e923 100644 --- a/kcachegrind/kcachegrind/coverageview.cpp +++ b/kcachegrind/kcachegrind/coverageview.cpp @@ -163,7 +163,7 @@ void CoverageView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); + popup.insertItem(i18n("Go to '%1'").arg(name), 93); popup.insertSeparator(); } diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp index 9df7e651..3b694ddf 100644 --- a/kcachegrind/kcachegrind/functionitem.cpp +++ b/kcachegrind/kcachegrind/functionitem.cpp @@ -103,7 +103,7 @@ void FunctionItem::setGroupType(TraceCost::CostType gt) #if 0 _groupPixValid = false; - viewList()->tqrepaint(); + viewList()->repaint(); #else TQColor c = Configuration::functionColor(_groupType, _function); setPixmap(3, colorPixmap(10, 10, c)); @@ -141,7 +141,7 @@ void FunctionItem::update() _sum = _function->inclusive()->subCost(_costType); double incl = 100.0 * _sum / inclTotal; if (Configuration::showPercentage()) - str = TQString("%1").tqarg(incl, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").arg(incl, 0, 'f', Configuration::percentPrecision()); else str = _function->inclusive()->prettySubCost(_costType); str = "< " + str; @@ -171,7 +171,7 @@ void FunctionItem::update() double incl = 100.0 * _sum / inclTotal; if (Configuration::showPercentage()) setText(0, TQString("%1") - .tqarg(incl, 0, 'f', Configuration::percentPrecision())); + .arg(incl, 0, 'f', Configuration::percentPrecision())); else setText(0, _function->inclusive()->prettySubCost(_costType)); @@ -189,7 +189,7 @@ void FunctionItem::update() if (Configuration::showPercentage()) setText(1, TQString("%1") - .tqarg(self, 0, 'f', Configuration::percentPrecision())); + .arg(self, 0, 'f', Configuration::percentPrecision())); else setText(1, _function->prettySubCost(_costType)); diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp index 437a17bf..c5646dd6 100644 --- a/kcachegrind/kcachegrind/functionselection.cpp +++ b/kcachegrind/kcachegrind/functionselection.cpp @@ -173,7 +173,7 @@ void FunctionSelection::functionContext(TQListViewItem* i, if (i) { f = ((FunctionItem*) i)->function(); if (f) { - popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93); + popup.insertItem(i18n("Go to %1").arg(f->prettyName()), 93); popup.insertSeparator(); } } @@ -417,7 +417,7 @@ void FunctionSelection::refresh() if (!_data || _data->parts().count()==0) { functionList->clear(); groupList->setUpdatesEnabled(true); - groupList->tqrepaint(); + groupList->repaint(); // this clears all other lists functionList->setSelected(functionList->firstChild(), true); @@ -547,9 +547,9 @@ void FunctionSelection::refresh() functionList->clearSelection(); //functionList->setUpdatesEnabled(true); - //functionList->tqrepaint(); + //functionList->repaint(); groupList->setUpdatesEnabled(true); - groupList->tqrepaint(); + groupList->repaint(); return; } } @@ -581,7 +581,7 @@ void FunctionSelection::refresh() groupList->clearSelection(); groupList->setUpdatesEnabled(true); - groupList->tqrepaint(); + groupList->repaint(); } @@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) #if 0 if (total == 0.0) { functionList->setUpdatesEnabled(true); - functionList->tqrepaint(); + functionList->repaint(); return; } #endif @@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) } //functionList->setUpdatesEnabled(true); - //functionList->tqrepaint(); + //functionList->repaint(); // Don't emit signal if cost item was changed programatically if (!_inSetGroup) { diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp index 985582a1..ce5e81bb 100644 --- a/kcachegrind/kcachegrind/instritem.cpp +++ b/kcachegrind/kcachegrind/instritem.cpp @@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, else templ += i18n("%n call to '%1'", "%n calls to '%1'", cc); - TQString callStr = templ.tqarg(_instrCall->call()->calledName()); + TQString callStr = templ.arg(_instrCall->call()->calledName()); TraceFunction* calledF = _instrCall->call()->called(); calledF->addPrettyLocation(callStr); @@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, TQString jStr; if (_instrJump->isCondJump()) jStr = i18n("Jump %1 of %2 times to 0x%3") - .tqarg(_instrJump->followedCount().pretty()) - .tqarg(_instrJump->executedCount().pretty()) - .tqarg(_instrJump->instrTo()->addr().toString()); + .arg(_instrJump->followedCount().pretty()) + .arg(_instrJump->executedCount().pretty()) + .arg(_instrJump->instrTo()->addr().toString()); else jStr = i18n("Jump %1 times to 0x%2") - .tqarg(_instrJump->executedCount().pretty()) - .tqarg(_instrJump->instrTo()->addr().toString()); + .arg(_instrJump->executedCount().pretty()) + .arg(_instrJump->instrTo()->addr().toString()); setText(6, jStr); @@ -209,7 +209,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .tqarg(pure, 0, 'f', Configuration::percentPrecision())); + .arg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -228,7 +228,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .tqarg(pure, 0, 'f', Configuration::percentPrecision())); + .arg(pure, 0, 'f', Configuration::percentPrecision())); else setText(2, _pure2.pretty()); @@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const } void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQColorGroup _cg( cg ); @@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg, if (column == 3) paintArrows(p, _cg, width); else - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } void InstrItem::setJumpArray(const TQMemArray& a) diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h index e521ebe0..2bbce71f 100644 --- a/kcachegrind/kcachegrind/instritem.h +++ b/kcachegrind/kcachegrind/instritem.h @@ -58,7 +58,7 @@ public: int compare(TQListViewItem * i, int col, bool ascending ) const; void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index 39bd9b0b..3df16793 100644 --- a/kcachegrind/kcachegrind/instrview.cpp +++ b/kcachegrind/kcachegrind/instrview.cpp @@ -188,11 +188,11 @@ void InstrView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); + popup.insertItem(i18n("Go to '%1'").arg(name), 93); popup.insertSeparator(); } else if (instr) { - popup.insertItem(i18n("Go to Address %1").tqarg(instr->name()), 93); + popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93); popup.insertSeparator(); } @@ -618,8 +618,8 @@ bool InstrView::fillInstrRange(TraceFunction* function, objfile = objfile.replace(TQRegExp("[\"']"), ""); // security... popencmd = TQString("objdump -C -d " "--start-address=0x%1 --stop-address=0x%2 \"%3\"") - .tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString()) - .tqarg(objfile); + .arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString()) + .arg(objfile); if (1) qDebug("Running '%s'...", popencmd.ascii()); // and run... @@ -875,7 +875,7 @@ bool InstrView::fillInstrRange(TraceFunction* function, "There are %n cost lines without assembler code.", noAssLines)); new InstrItem(this, this, 2, i18n("This happens because the code of")); - new InstrItem(this, this, 3, TQString(" %1").tqarg(objfile)); + new InstrItem(this, this, 3, TQString(" %1").arg(objfile)); new InstrItem(this, this, 4, i18n("does not seem to match the profile data file.")); new InstrItem(this, this, 5, ""); diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp index 18148927..4288e2df 100644 --- a/kcachegrind/kcachegrind/multiview.cpp +++ b/kcachegrind/kcachegrind/multiview.cpp @@ -65,7 +65,7 @@ void MultiView::appendView() int n = _views.count()+1; TabView* tv = new TabView(this, this, - TQString("TabView-%1").tqarg(n).ascii()); + TQString("TabView-%1").arg(n).ascii()); connect(tv, TQT_SIGNAL(activated(TabView*)), this, TQT_SLOT(tabActivated(TabView*)) ); _views.append(tv); @@ -187,7 +187,7 @@ void MultiView::readViewConfig(KConfig* c, TabView* tv, *activeTV = 0; for(tv=_views.first();tv;tv=_views.next()) { if (tv->name() == active) activeTV=tv; - tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()), + tv->readViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()), postfix, withOptions); } @@ -216,7 +216,7 @@ void MultiView::saveViewConfig(KConfig* c, TabView* tv; for(tv=_views.first();tv;tv=_views.next()) - tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()), + tv->saveViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()), postfix, withOptions); } diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp index aa01e627..a20f53dc 100644 --- a/kcachegrind/kcachegrind/partgraph.cpp +++ b/kcachegrind/kcachegrind/partgraph.cpp @@ -90,7 +90,7 @@ void PartAreaWidget::refreshParts() { // rebuild only subparts to keep part selection state TreeMapItem* i; - TreeMapItemList* l = base()->tqchildren(); + TreeMapItemList* l = base()->children(); if (l) for (i=l->first();i;i=l->next()) i->refresh(); @@ -115,7 +115,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt) // rebuild hierarchy below parts. // thus, selected parts stay selected TreeMapItem* i; - TreeMapItemList* l = base()->tqchildren(); + TreeMapItemList* l = base()->children(); if (l) for (i=l->first();i;i=l->next()) i->refresh(); @@ -164,7 +164,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const while (i && i->rtti()==3) i = i->parent(); if (i && i->rtti()==2) { - itemTip = i18n("Profile Part %1").tqarg(i->text(0)); + itemTip = i18n("Profile Part %1").arg(i->text(0)); if (!i->text(1).isEmpty()) itemTip += " (" + i->text(1) + ")"; @@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data) refresh(); } -TreeMapItemList* BasePartItem::tqchildren() +TreeMapItemList* BasePartItem::children() { - if (!_data) return _tqchildren; + if (!_data) return _children; if (!initialized()) { // qDebug("Create Parts (%s)", name().ascii()); @@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::tqchildren() addItem(new PartItem(part)); } - return _tqchildren; + return _children; } TQString BasePartItem::text(int textNo) const @@ -276,7 +276,7 @@ TQString PartItem::text(int textNo) const TraceCost* t = _p->data()->totals(); double p = 100.0 * v / t->subCost(ct); return TQString("%1 %") - .tqarg(p, 0, 'f', Configuration::percentPrecision()); + .arg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -324,9 +324,9 @@ double PartItem::sum() const return 0.0; } -TreeMapItemList* PartItem::tqchildren() +TreeMapItemList* PartItem::children() { - if (initialized()) return _tqchildren; + if (initialized()) return _children; TraceCost* c; // qDebug("Create Part subitems (%s)", name().ascii()); @@ -339,7 +339,7 @@ TreeMapItemList* PartItem::tqchildren() if (c) addItem(new SubPartItem(c)); } - return _tqchildren; + return _children; } @@ -397,7 +397,7 @@ TreeMapItemList* PartItem::tqchildren() break; } - return _tqchildren; + return _children; } @@ -443,7 +443,7 @@ TQString SubPartItem::text(int textNo) const _partCostItem->part() : _partCostItem->part()->data()->totals(); double p = 100.0 * v / t->subCost(ct); return TQString("%1 %") - .tqarg(p, 0, 'f', Configuration::percentPrecision()); + .arg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -491,7 +491,7 @@ double SubPartItem::sum() const return 0.0; } -TreeMapItemList* SubPartItem::tqchildren() +TreeMapItemList* SubPartItem::children() { if (!initialized()) { // qDebug("Create Part sub-subitems (%s)", name().ascii()); @@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::tqchildren() PartAreaWidget* w = (PartAreaWidget*)widget(); if (depth()-2 > w->callLevels()) - return _tqchildren; + return _children; if (w->visualisation() == PartAreaWidget::Inclusive) { TracePartCall* call; @@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::tqchildren() } } - return _tqchildren; + return _children; } diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h index f8ad4ccd..f28f12eb 100644 --- a/kcachegrind/kcachegrind/partgraph.h +++ b/kcachegrind/kcachegrind/partgraph.h @@ -83,7 +83,7 @@ public: double value() const; TQString text(int) const; int borderWidth() const { return 0; } - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: @@ -101,7 +101,7 @@ public: int borderWidth() const { return 0; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: @@ -120,7 +120,7 @@ public: SplitMode splitMode() const { return Vertical; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp index debea16a..40c2db36 100644 --- a/kcachegrind/kcachegrind/partlistitem.cpp +++ b/kcachegrind/kcachegrind/partlistitem.cpp @@ -46,7 +46,7 @@ PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem, #if 0 TQString partName = TQString::number(part->partNumber()); if (part->data()->maxThreadID() >1) - partName += i18n(" (Thread %1)").tqarg(part->threadID()); + partName += i18n(" (Thread %1)").arg(part->threadID()); setText(0, partName); #else setText(0, _part->prettyName()); @@ -107,7 +107,7 @@ void PartListItem::update() double pure = 100.0 * _pure / selfTotal; if (Configuration::showPercentage()) { setText(2, TQString("%1") - .tqarg(pure, 0, 'f', Configuration::percentPrecision())); + .arg(pure, 0, 'f', Configuration::percentPrecision())); } else setText(2, _partCostItem->prettySubCost(_costType)); @@ -123,7 +123,7 @@ void PartListItem::update() double sum = 100.0 * _sum / total; if (Configuration::showPercentage()) { setText(1, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp index c501702d..703dd75f 100644 --- a/kcachegrind/kcachegrind/partselection.cpp +++ b/kcachegrind/kcachegrind/partselection.cpp @@ -148,7 +148,7 @@ void PartSelection::currentChangedSlot(TreeMapItem* i, bool kbd) TQString str = i->text(0); if (!i->text(1).isEmpty()) str += " (" + i->text(1) + ")"; - TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(str); + TQString msg = i18n("Profile Part Overview: Current is '%1'").arg(str); emit showMessage(msg, 5000); if (_showInfo) fillInfo(); @@ -203,7 +203,7 @@ void PartSelection::selectionChanged() TracePart* part; // if nothing is selected, activate all parts - TreeMapItemList* list = partAreaWidget->base()->tqchildren(); + TreeMapItemList* list = partAreaWidget->base()->children(); if (!list) return; for (i=list->first();i;i=list->next()) @@ -235,7 +235,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list) kdDebug() << "Entering PartSelection::activePartsChangedSlot" << endl; TreeMapItem* i; - TreeMapItemList l = *partAreaWidget->base()->tqchildren(); + TreeMapItemList l = *partAreaWidget->base()->children(); // first deselect inactive, then select active (makes current active) for (i=l.first();i;i=l.next()) { TracePart* part = ((PartItem*)i)->part(); @@ -381,7 +381,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i, case 2: // select all parts { - TreeMapItemList list = *partAreaWidget->base()->tqchildren(); + TreeMapItemList list = *partAreaWidget->base()->children(); partAreaWidget->setRangeSelection(list.first(), list.last(), true); } break; diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 853e9928..3f344bbc 100644 --- a/kcachegrind/kcachegrind/partview.cpp +++ b/kcachegrind/kcachegrind/partview.cpp @@ -103,8 +103,8 @@ void PartView::context(TQListViewItem* i, const TQPoint & pos, int) TracePart* p = i ? ((PartListItem*) i)->part() : 0; if (p) { - popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93); - popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94); + popup.insertItem(i18n("Select '%1'").arg(p->name()), 93); + popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94); popup.insertSeparator(); } diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp index 6bfc33ac..305b8244 100644 --- a/kcachegrind/kcachegrind/sourceitem.cpp +++ b/kcachegrind/kcachegrind/sourceitem.cpp @@ -87,7 +87,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, else templ += i18n("%n call to '%1'", "%n calls to '%1'", cc); - TQString callStr = templ.tqarg(_lineCall->call()->calledName()); + TQString callStr = templ.arg(_lineCall->call()->calledName()); TraceFunction* calledF = _lineCall->call()->called(); calledF->addPrettyLocation(callStr); @@ -123,13 +123,13 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, TQString jStr; if (_lineJump->isCondJump()) jStr = i18n("Jump %1 of %2 times to %3") - .tqarg(_lineJump->followedCount().pretty()) - .tqarg(_lineJump->executedCount().pretty()) - .tqarg(to); + .arg(_lineJump->followedCount().pretty()) + .arg(_lineJump->executedCount().pretty()) + .arg(to); else jStr = i18n("Jump %1 times to %2") - .tqarg(_lineJump->executedCount().pretty()) - .tqarg(to); + .arg(_lineJump->executedCount().pretty()) + .arg(to); setText(4, jStr); } @@ -193,7 +193,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .tqarg(pure, 0, 'f', Configuration::percentPrecision())); + .arg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -212,7 +212,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .tqarg(pure2, 0, 'f', Configuration::percentPrecision())); + .arg(pure2, 0, 'f', Configuration::percentPrecision())); else setText(2, _pure2.pretty()); @@ -285,7 +285,7 @@ int SourceItem::compare(TQListViewItem * i, int col, bool ascending ) const } void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQColorGroup _cg( cg ); @@ -297,7 +297,7 @@ void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg, if (column == 3) paintArrows(p, _cg, width); else - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } void SourceItem::setJumpArray(const TQMemArray& a) diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h index 30589835..925e575b 100644 --- a/kcachegrind/kcachegrind/sourceitem.h +++ b/kcachegrind/kcachegrind/sourceitem.h @@ -57,7 +57,7 @@ public: int compare(TQListViewItem * i, int col, bool ascending ) const; void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; void updateGroup(); diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp index 64b3e995..dde291ea 100644 --- a/kcachegrind/kcachegrind/sourceview.cpp +++ b/kcachegrind/kcachegrind/sourceview.cpp @@ -113,11 +113,11 @@ void SourceView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); + popup.insertItem(i18n("Go to '%1'").arg(name), 93); popup.insertSeparator(); } else if (line) { - popup.insertItem(i18n("Go to Line %1").tqarg(line->name()), 93); + popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93); popup.insertSeparator(); } @@ -513,7 +513,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) new SourceItem(this, this, fileno, 1, false, i18n("with any source line of this function in file")); new SourceItem(this, this, fileno, 2, false, - TQString(" '%1'").tqarg(sf->function()->prettyName())); + TQString(" '%1'").arg(sf->function()->prettyName())); new SourceItem(this, this, fileno, 3, false, i18n("Thus, no annotated source can be shown.")); return; @@ -550,13 +550,13 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) // do it here, because the source directory could have been set before if (childCount()==0) { setColumnText(4, validSourceFile ? - i18n("Source ('%1')").tqarg(filename) : + i18n("Source ('%1')").arg(filename) : i18n("Source (unknown)")); } else { new SourceItem(this, this, fileno, 0, true, validSourceFile ? - i18n("--- Inlined from '%1' ---").tqarg(filename) : + i18n("--- Inlined from '%1' ---").arg(filename) : i18n("--- Inlined from unknown source ---")); } @@ -564,7 +564,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) new SourceItem(this, this, fileno, 0, false, i18n("There is no source available for the following function:")); new SourceItem(this, this, fileno, 1, false, - TQString(" '%1'").tqarg(sf->function()->prettyName())); + TQString(" '%1'").arg(sf->function()->prettyName())); if (sf->file()->name().isEmpty()) { new SourceItem(this, this, fileno, 2, false, i18n("This is because no debug information is present.")); @@ -575,14 +575,14 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) i18n("The function is located in this ELF object:")); new SourceItem(this, this, fileno, 5, false, TQString(" '%1'") - .tqarg(sf->function()->object()->prettyName())); + .arg(sf->function()->object()->prettyName())); } } else { new SourceItem(this, this, fileno, 2, false, i18n("This is because its source file cannot be found:")); new SourceItem(this, this, fileno, 3, false, - TQString(" '%1'").tqarg(sf->file()->name())); + TQString(" '%1'").arg(sf->file()->name())); new SourceItem(this, this, fileno, 4, false, i18n("Add the folder of this file to the source folder list.")); new SourceItem(this, this, fileno, 5, false, diff --git a/kcachegrind/kcachegrind/stackitem.cpp b/kcachegrind/kcachegrind/stackitem.cpp index af0499ba..e3763ab4 100644 --- a/kcachegrind/kcachegrind/stackitem.cpp +++ b/kcachegrind/kcachegrind/stackitem.cpp @@ -85,7 +85,7 @@ void StackItem::updateCost() if (Configuration::showPercentage()) setText(0, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); else setText(0, _call->prettySubCost(ct)); @@ -107,7 +107,7 @@ void StackItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .tqarg(sum, 0, 'f', Configuration::percentPrecision())); + .arg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index 52f728b5..0049d1e2 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -419,7 +419,7 @@ void TabView::updateVisibility() s.append(100); - // tqchildren of mainSplitter + // children of mainSplitter if (_rightTW->isHidden() != (r == 0)) { if (r == 0) { _rightTW->hide(); @@ -441,7 +441,7 @@ void TabView::updateVisibility() _leftSplitter->show(); } - // tqchildren of leftSplitter + // children of leftSplitter if (_topTW->isHidden() != (t == 0)) { if (t == 0) { _topTW->hide(); @@ -463,7 +463,7 @@ void TabView::updateVisibility() _bottomSplitter->show(); } - // tqchildren of bottomSplitter + // children of bottomSplitter if (_bottomTW->isHidden() != (b == 0)) { if (b == 0) { _bottomTW->hide(); @@ -700,7 +700,7 @@ void TabView::resizeEvent(TQResizeEvent* e) void TabView::selected(TraceItemView*, TraceItem* s) { - // we set selected item for our own tqchildren + // we set selected item for our own children select(s); updateView(); @@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c, if (withOptions) v->readViewConfig(c, TQString("%1-%2") - .tqarg(prefix).tqarg(v->widget()->name()), + .arg(prefix).arg(v->widget()->name()), postfix, true); } if (activeTop) _topTW->showPage(activeTop->widget()); @@ -883,8 +883,8 @@ void TabView::saveViewConfig(KConfig* c, if (withOptions) for (v=_tabs.first();v;v=_tabs.next()) - v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix) - .tqarg(v->widget()->name()), postfix, true); + v->saveViewConfig(c, TQString("%1-%2").arg(prefix) + .arg(v->widget()->name()), postfix, true); } #include "tabview.moc" diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h index 221e6e08..b9b40269 100644 --- a/kcachegrind/kcachegrind/tabview.h +++ b/kcachegrind/kcachegrind/tabview.h @@ -55,7 +55,7 @@ class TabBar : public TQTabBar /** * Own Splitter: - * Call checkVisiblity for all TabWidget tqchildren of the splitter + * Call checkVisiblity for all TabWidget children of the splitter * on a MoveEvent. This typically is produced when collapsing the widget * inside of another splitter. */ diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp index b063dd24..58cd6577 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -226,21 +226,21 @@ void TopLevel::saveTraceSettings() TQString key = traceKey(); KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); - pConfig.writeEntry(TQString("CostType%1").tqarg(key), + pConfig.writeEntry(TQString("CostType%1").arg(key), _costType ? _costType->name() : TQString("?")); - pConfig.writeEntry(TQString("CostType2%1").tqarg(key), + pConfig.writeEntry(TQString("CostType2%1").arg(key), _costType2 ? _costType2->name() : TQString("?")); - pConfig.writeEntry(TQString("GroupType%1").tqarg(key), + pConfig.writeEntry(TQString("GroupType%1").arg(key), TraceItem::typeName(_groupType)); if (!_data) return; KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); - aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount); - aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent); + aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount); + aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent); saveCurrentState(key); - pConfig.writeEntry(TQString("Group%1").tqarg(key), + pConfig.writeEntry(TQString("Group%1").arg(key), _group ? _group->name() : TQString()); } @@ -1137,7 +1137,7 @@ void TopLevel::exportGraph() ge.writeDot(); TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&") - .tqarg(n).tqarg(n).tqarg(n); + .arg(n).arg(n).arg(n); system(TQFile::encodeName( cmd )); } @@ -1725,9 +1725,9 @@ void TopLevel::restoreTraceTypes() KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); TQString groupType, costType, costType2; - groupType = pConfig.readEntry(TQString("GroupType%1").tqarg(key)); - costType = pConfig.readEntry(TQString("CostType%1").tqarg(key)); - costType2 = pConfig.readEntry(TQString("CostType2%1").tqarg(key)); + groupType = pConfig.readEntry(TQString("GroupType%1").arg(key)); + costType = pConfig.readEntry(TQString("CostType%1").arg(key)); + costType2 = pConfig.readEntry(TQString("CostType2%1").arg(key)); if (groupType.isEmpty()) groupType = cConfig.readEntry("GroupType"); if (costType.isEmpty()) costType = cConfig.readEntry("CostType"); @@ -1742,8 +1742,8 @@ void TopLevel::restoreTraceTypes() costTypeSelected(_saCost->items().first()); KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); - _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0); - _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0); + _layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0); + _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0); if (_layoutCount == 0) layoutRestore(); updateLayoutActions(); } @@ -1761,7 +1761,7 @@ void TopLevel::restoreTraceSettings() TQString key = traceKey(); KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); - TQString group = pConfig.readEntry(TQString("Group%1").tqarg(key)); + TQString group = pConfig.readEntry(TQString("Group%1").arg(key)); if (!group.isEmpty()) setGroup(group); restoreCurrentState(key); @@ -1782,7 +1782,7 @@ void TopLevel::layoutDuplicate() { // save current and allocate a new slot _multiView->saveViewConfig(KGlobal::config(), - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), traceKey(), false); _layoutCurrent = _layoutCount; _layoutCount++; @@ -1800,7 +1800,7 @@ void TopLevel::layoutRemove() if (_layoutCurrent == from) { _layoutCurrent--; from--; } // restore from last and decrement count _multiView->readViewConfig(KGlobal::config(), - TQString("Layout%1-MainView").tqarg(from), + TQString("Layout%1-MainView").arg(from), traceKey(), false); _layoutCount--; @@ -1815,13 +1815,13 @@ void TopLevel::layoutNext() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); _layoutCurrent++; if (_layoutCurrent == _layoutCount) _layoutCurrent = 0; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); if (0) kdDebug() << "TopLevel::layoutNext: current " @@ -1836,13 +1836,13 @@ void TopLevel::layoutPrevious() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); _layoutCurrent--; if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); if (0) kdDebug() << "TopLevel::layoutPrevious: current " @@ -1855,20 +1855,20 @@ void TopLevel::layoutSave() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); for(int i=0;i<_layoutCount;i++) { _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(i), + TQString("Layout%1-MainView").arg(i), key, false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").tqarg(i), + TQString("Layout%1-MainView").arg(i), TQString(), false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); KConfigGroup aConfig(config, TQCString("Layouts")); @@ -1890,15 +1890,15 @@ void TopLevel::layoutRestore() TQString key = traceKey(); for(int i=0;i<_layoutCount;i++) { _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(i), + TQString("Layout%1-MainView").arg(i), TQString(), false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").tqarg(i), + TQString("Layout%1-MainView").arg(i), key, false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").tqarg(_layoutCurrent), + TQString("Layout%1-MainView").arg(_layoutCurrent), key, false); updateLayoutActions(); @@ -1918,7 +1918,7 @@ void TopLevel::updateLayoutActions() ka = actionCollection()->action("layout_remove"); if (ka) ka->setEnabled(_layoutCount>1); - _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000); + _statusbar->message(i18n("Layout Count: %1").arg(_layoutCount), 1000); } @@ -1930,19 +1930,19 @@ void TopLevel::updateStatusBar() } TQString status = TQString("%1 [%2] - ") - .tqarg(_data->shortTraceName()) - .tqarg(_data->activePartRange()); + .arg(_data->shortTraceName()) + .arg(_data->activePartRange()); if (_costType) { status += i18n("Total %1 Cost: %2") - .tqarg(_costType->longName()) - .tqarg(_data->prettySubCost(_costType)); + .arg(_costType->longName()) + .arg(_data->prettySubCost(_costType)); /* this gets too long... if (_costType2 && (_costType2 != _costType)) status += i18n(", %1 Cost: %2") - .tqarg(_costType2->longName()) - .tqarg(_data->prettySubCost(_costType2)); + .arg(_costType2->longName()) + .arg(_data->prettySubCost(_costType2)); */ } else @@ -1952,8 +1952,8 @@ void TopLevel::updateStatusBar() if (_groupType != TraceItem::Function) { status += TQString(" - %1 '%2'") - .tqarg(TraceItem::i18nTypeName(_groupType)) - .tqarg(_group ? _group->prettyName() : i18n("(None)")); + .arg(TraceItem::i18nTypeName(_groupType)) + .arg(_group ? _group->prettyName() : i18n("(None)")); } */ @@ -2048,7 +2048,7 @@ void TopLevel::configChanged() //qDebug("TopLevel::configChanged"); //_showPercentage->setChecked(Configuration::showPercentage()); - // tqinvalidate found/cached dirs of source files + // invalidate found/cached dirs of source files _data->resetSourceDirs(); _partSelection->refresh(); diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index 6e1a8ad3..f129c2e5 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -226,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s) void TraceItem::clear() { - tqinvalidate(); + invalidate(); } @@ -239,8 +239,8 @@ TQString TraceItem::name() const { if (part()) { return i18n("%1 from %2") - .tqarg(_dep->name()) - .tqarg(part()->name()); + .arg(_dep->name()) + .arg(part()->name()); } if (_dep) @@ -259,21 +259,21 @@ TQString TraceItem::prettyName() const TQString TraceItem::fullName() const { return TQString("%1 %2") - .tqarg(typeName(type())).tqarg(prettyName()); + .arg(typeName(type())).arg(prettyName()); } TQString TraceItem::toString() { - return TQString("%1\n [%3]").tqarg(fullName()).tqarg(costString(0)); + return TQString("%1\n [%3]").arg(fullName()).arg(costString(0)); } -void TraceItem::tqinvalidate() +void TraceItem::invalidate() { if (_dirty) return; _dirty = true; if (_dep) - _dep->tqinvalidate(); + _dep->invalidate(); } void TraceItem::update() @@ -360,7 +360,7 @@ void TraceCost::set(TraceSubMapping* sm, const char* s) _count = maxIndex; } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); } void TraceCost::set(TraceSubMapping* sm, FixString & s) @@ -391,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s) _cost[i] = 0; _count = maxIndex+1; } - tqinvalidate(); + invalidate(); } @@ -436,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s) } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of tqinvalidate() + _dirty = true; // because of invalidate() #endif } @@ -488,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s) } } - tqinvalidate(); + invalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of tqinvalidate() + _dirty = true; // because of invalidate() #endif } @@ -544,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s) } } - tqinvalidate(); + invalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of tqinvalidate() + _dirty = true; // because of invalidate() #endif } @@ -578,14 +578,14 @@ void TraceCost::addCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s added cost item\n %s\n now %s", fullName().ascii(), item->fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of tqinvalidate() + _dirty = true; // because of invalidate() #endif } @@ -612,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s added cost item\n %s\n now %s", fullName().ascii(), item->fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of tqinvalidate() + _dirty = true; // because of invalidate() #endif } @@ -636,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value) } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); } void TraceCost::maxCost(int type, SubCost value) @@ -653,7 +653,7 @@ void TraceCost::maxCost(int type, SubCost value) } // a cost change has to be propagated (esp. in subclasses) - tqinvalidate(); + invalidate(); } @@ -691,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m) } -void TraceCost::tqinvalidate() +void TraceCost::invalidate() { if (_dirty) return; _dirty = true; _cachedType = 0; // cached value is invalid, too if (_dep) - _dep->tqinvalidate(); + _dep->invalidate(); } void TraceCost::update() @@ -767,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*) if (_dirty) update(); return TQString("%1/%2") - .tqarg(_followedCount.pretty()) - .tqarg(_executedCount.pretty()); + .arg(_followedCount.pretty()) + .arg(_executedCount.pretty()); } void TraceJumpCost::clear() @@ -913,7 +913,7 @@ TQString TraceCostType::parsedFormula() if (!t) continue; if (!t->name().isEmpty()) - res += TQString(" * %1").tqarg(t->name()); + res += TQString(" * %1").arg(t->name()); } return res; @@ -1362,8 +1362,8 @@ TraceCallCost::~TraceCallCost() TQString TraceCallCost::costString(TraceCostMapping* m) { return TQString("%1, Calls %2") - .tqarg(TraceCost::costString(m)) - .tqarg(_callCount.pretty()); + .arg(TraceCost::costString(m)) + .arg(_callCount.pretty()); } TQString TraceCallCost::prettyCallCount() @@ -1388,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c) { _callCount += c; - tqinvalidate(); + invalidate(); } @@ -1404,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost() TQString TraceInclusiveCost::costString(TraceCostMapping* m) { return TQString("%1, Inclusive %2") - .tqarg(TraceCost::costString(m)) - .tqarg(_inclusive.costString(m)); + .arg(TraceCost::costString(m)) + .arg(_inclusive.costString(m)); } void TraceInclusiveCost::clear() @@ -1425,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c) { _inclusive.addCost(c); - tqinvalidate(); + invalidate(); } @@ -1452,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep) _deps.append(dep); _lastDep = dep; - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1526,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep) _deps.append(dep); _lastDep = dep; - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1600,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep) _deps.append(dep); _lastDep = dep; - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1679,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep) _deps.append(dep); _lastDep = dep; - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1897,9 +1897,9 @@ TQString TracePartFunction::costString(TraceCostMapping* m) TQString res = TraceInclusiveCost::costString(m); res += TQString(", called from %1: %2") - .tqarg(_calledContexts).tqarg(prettyCalledCount()); + .arg(_calledContexts).arg(prettyCalledCount()); res += TQString(", calling from %1: %2") - .tqarg(_callingContexts).tqarg(prettyCallingCount()); + .arg(_callingContexts).arg(prettyCallingCount()); return res; } @@ -1916,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref) #endif _partInstr.append(ref); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1937,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref) #endif _partLines.append(ref); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1958,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref) #endif _partCallers.append(ref); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added Caller\n %s (now %d)", @@ -1979,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref) #endif _partCallings.append(ref); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added Calling\n %s (now %d)", @@ -2136,8 +2136,8 @@ TracePartClass::~TracePartClass() TQString TracePartClass::prettyName() const { return TQString("%1 from %2") - .tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) - .tqarg(part()->name()); + .arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) + .arg(part()->name()); } //--------------------------------------------------- @@ -2233,8 +2233,8 @@ void TraceInstrJump::update() TQString TraceInstrJump::name() const { return TQString("jump at 0x%1 to 0x%2") - .tqarg(_instrFrom->addr().toString()) - .tqarg(_instrTo->addr().toString()); + .arg(_instrFrom->addr().toString()) + .arg(_instrTo->addr().toString()); } @@ -2316,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part) TQString TraceLineJump::name() const { return TQString("jump at %1 to %2") - .tqarg(_lineFrom->prettyName()) - .tqarg(_lineTo->prettyName()); + .arg(_lineFrom->prettyName()) + .arg(_lineTo->prettyName()); } @@ -2395,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part, TQString TraceInstrCall::name() const { - return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name()); + return TQString("%1 at %2").arg(_call->name()).arg(_instr->name()); } @@ -2431,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part, TQString TraceLineCall::name() const { - return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name()); + return TQString("%1 at %2").arg(_call->name()).arg(_line->name()); } @@ -2478,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i) icall = new TraceInstrCall(this, i); _instrCalls.append(icall); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii()); @@ -2500,7 +2500,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l) lcall = new TraceLineCall(this, l); _lineCalls.append(lcall); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii()); @@ -2515,21 +2515,21 @@ void TraceCall::invalidateDynamicCost() { TraceLineCall* lc; for (lc=_lineCalls.first();lc;lc=_lineCalls.next()) - lc->tqinvalidate(); + lc->invalidate(); TraceInstrCall* ic; for (ic=_instrCalls.first();ic;ic=_instrCalls.next()) - ic->tqinvalidate(); + ic->invalidate(); - tqinvalidate(); + invalidate(); } TQString TraceCall::name() const { return TQString("%1 => %2") - .tqarg(_caller->name()) - .tqarg(_called->name()); + .arg(_caller->name()) + .arg(_called->name()); } int TraceCall::inCycle() @@ -2587,7 +2587,7 @@ TQString TraceCall::callerName(bool skipCycle) const TraceFunctionCycle* c = _called->cycle(); if (c && _caller && (_caller->cycle() != c)) { TQString via = _called->prettyName(); - return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(via); + return i18n("%1 via %2").arg(_caller->prettyName()).arg(via); } } @@ -2606,7 +2606,7 @@ TQString TraceCall::calledName(bool skipCycle) const _called->setCycle(0); TQString via = _called->prettyName(); _called->setCycle(c); - return i18n("%1 via %2").tqarg(c->name()).tqarg(via); + return i18n("%1 via %2").arg(c->name()).arg(via); } } return _called->prettyName(); @@ -2692,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall) #endif _instrCalls.append(instrCall); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -2704,12 +2704,12 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall) TQString TraceInstr::name() const { - return TQString("0x%1").tqarg(_addr.toString()); + return TQString("0x%1").arg(_addr.toString()); } TQString TraceInstr::prettyName() const { - return TQString("0x%1").tqarg(_addr.toString()); + return TQString("0x%1").arg(_addr.toString()); } @@ -2807,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall) } _lineCalls.append(lineCall); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -2824,13 +2824,13 @@ TQString TraceLine::name() const return i18n("(unknown)"); return TQString("%1:%2") - .tqarg(fileShortName).tqarg(_lineno); + .arg(fileShortName).arg(_lineno); } TQString TraceLine::prettyName() const { return TQString("%1 [%2]") - .tqarg(name()).tqarg(_sourceFile->function()->prettyName()); + .arg(name()).arg(_sourceFile->function()->prettyName()); } //--------------------------------------------------- @@ -2869,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource() TQString TraceFunctionSource::name() const { - return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name()); + return TQString("%1 for %2").arg(_file->name()).arg(_function->name()); } uint TraceFunctionSource::firstLineno() @@ -2952,10 +2952,10 @@ void TraceFunctionSource::invalidateDynamicCost() TraceLineMap::Iterator lit; for ( lit = _lineMap->begin(); lit != _lineMap->end(); ++lit ) - (*lit).tqinvalidate(); + (*lit).invalidate(); } - tqinvalidate(); + invalidate(); } TraceLineMap* TraceFunctionSource::lineMap() @@ -3125,7 +3125,7 @@ void TraceAssoziation::clear(TraceData* d, int rtti) (*it).removeAssoziation(rtti); } -void TraceAssoziation::tqinvalidate(TraceData* d, int rtti) +void TraceAssoziation::invalidate(TraceData* d, int rtti) { TraceFunctionMap::Iterator it; for ( it = d->functionMap().begin(); @@ -3203,7 +3203,7 @@ void TraceFunction::invalidateAssoziation(int rtti) TraceAssoziation* a; for (a=_assoziations.first();a;a=_assoziations.next()) if ((rtti==0) || (a->rtti() == rtti)) - a->tqinvalidate(); + a->invalidate(); } TraceAssoziation* TraceFunction::assoziation(int rtti) @@ -3254,9 +3254,9 @@ TQString TraceFunction::prettyName() const // cycle members if (_cycle) { if (_cycle != this) - res = TQString("%1 ").tqarg(res).tqarg(_cycle->cycleNo()); + res = TQString("%1 ").arg(res).arg(_cycle->cycleNo()); else - res = TQString("").tqarg(_cycle->cycleNo()); + res = TQString("").arg(_cycle->cycleNo()); } @@ -3279,9 +3279,9 @@ TQString TraceFunction::location(int maxFiles) const uint to = lastAddress(); if (from != 0 && to != 0) { if (from == to) - loc += TQString(" (0x%1)").tqarg(to, 0, 16); + loc += TQString(" (0x%1)").arg(to, 0, 16); else - loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(to, 0, 16); + loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16); } #endif } @@ -3310,9 +3310,9 @@ TQString TraceFunction::location(int maxFiles) const to = sourceFile->lastLineno(); if (from != 0 && to != 0) { if (from == to) - loc += TQString(" (%1)").tqarg(to); + loc += TQString(" (%1)").arg(to); else - loc += TQString(" (%1-%2)").tqarg(from).tqarg(to); + loc += TQString(" (%1-%2)").arg(from).arg(to); } #endif } @@ -3334,7 +3334,7 @@ void TraceFunction::addPrettyLocation(TQString& s, int maxFiles) const TQString l = location(maxFiles); if (l.isEmpty()) return; - s += TQString(" (%1)").tqarg(l); + s += TQString(" (%1)").arg(l); } TQString TraceFunction::prettyNameWithLocation(int maxFiles) const @@ -3342,17 +3342,17 @@ TQString TraceFunction::prettyNameWithLocation(int maxFiles) const TQString l = location(maxFiles); if (l.isEmpty()) return prettyName(); - return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l); + return TQString("%1 (%2)").arg(prettyName()).arg(l); } TQString TraceFunction::info() const { TQString l = location(); if (l.isEmpty()) - return TQString("Function %1").tqarg(name()); + return TQString("Function %1").arg(name()); return TQString("Function %1 (location %2)") - .tqarg(name()).tqarg(l); + .arg(name()).arg(l); } @@ -3414,7 +3414,7 @@ void TraceFunction::addCaller(TraceCall* caller) #endif _callers.append(caller); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added Caller\n %s (now %d)", @@ -3435,8 +3435,8 @@ TraceCall* TraceFunction::calling(TraceFunction* called) _callingMap.insert(called, calling); _callings.append(calling); - // we have to tqinvalidate ourself so invalidations from item propagate up - tqinvalidate(); + // we have to invalidate ourself so invalidations from item propagate up + invalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii()); @@ -3460,8 +3460,8 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file, _sourceFiles.append(sourceFile); - // we have to tqinvalidate ourself so invalidations from item propagate up - tqinvalidate(); + // we have to invalidate ourself so invalidations from item propagate up + invalidate(); #if TRACE_DEBUG qDebug("Created SourceFile %s [TraceFunction::line]", @@ -3601,10 +3601,10 @@ void TraceFunction::invalidateDynamicCost() TraceInstrMap::Iterator iit; for ( iit = _instrMap->begin(); iit != _instrMap->end(); ++iit ) - (*iit).tqinvalidate(); + (*iit).invalidate(); } - tqinvalidate(); + invalidate(); } void TraceFunction::update() @@ -3951,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n) _cycle = this; setPosition(f->data()); - setName(TQString("").tqarg(n)); + setName(TQString("").arg(n)); // reset to attributes of base function setFile(_base->file()); @@ -3967,7 +3967,7 @@ void TraceFunctionCycle::init() // this deletes all TraceCall's to members _callings.clear(); - tqinvalidate(); + invalidate(); } void TraceFunctionCycle::add(TraceFunction* f) @@ -3993,13 +3993,13 @@ void TraceFunctionCycle::setup() // the cycle has a call to each member call = new TraceCall(this, f); - call->tqinvalidate(); + call->invalidate(); _callings.append(call); // now do some faking... f->setCycle(this); } - tqinvalidate(); + invalidate(); } @@ -4046,7 +4046,7 @@ void TraceClass::addFunction(TraceFunction* function) _functions.append(function); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4093,7 +4093,7 @@ void TraceFile::addFunction(TraceFunction* function) _functions.append(function); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4114,7 +4114,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile) _sourceFiles.append(sourceFile); // not truely needed, as we don't use the sourceFiles for cost update - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s \n added SourceFile %s (now %d)", @@ -4211,7 +4211,7 @@ void TraceObject::addFunction(TraceFunction* function) _functions.append(function); - tqinvalidate(); + invalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4298,9 +4298,9 @@ TQString TracePart::shortName() const TQString TracePart::prettyName() const { - TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number); + TQString name = TQString("%1.%2").arg(_pid).arg(_number); if (data()->maxThreadID()>1) - name += TQString("-%3").tqarg(_tid); + name += TQString("-%3").arg(_tid); return name; } @@ -4498,7 +4498,7 @@ void TraceData::load(const TQString& base) if ((str.length() > pos) && (str[pos] == '.')) { pos++; while(str.length()>pos) { - if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break; + if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break; n = 10*n + (str[pos++] - '0'); } } @@ -4508,7 +4508,7 @@ void TraceData::load(const TQString& base) if ((str.length() > pos) && (str[pos] == '-')) { pos++; while(str.length()>pos) { - if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break; + if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break; t = 10*t + (str[pos++] - '0'); } } @@ -4536,7 +4536,7 @@ void TraceData::load(const TQString& base) TracePart* TraceData::addPart(const TQString& dir, const TQString& name) { - TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name); + TQString filename = TQString("%1/%2").arg(dir).arg(name); #if TRACE_DEBUG qDebug("TraceData::addPart('%s')", filename.ascii()); #endif @@ -4632,14 +4632,14 @@ TQString TraceData::activePartRange() else { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").tqarg(r1).tqarg(r2); + else res += TQString("%1-%2").arg(r1).arg(r2); r1 = r2 = count; } } if (r1>=0) { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").tqarg(r1).tqarg(r2); + else res += TQString("%1-%2").arg(r1).arg(r2); } return res; @@ -4647,22 +4647,22 @@ TQString TraceData::activePartRange() void TraceData::invalidateDynamicCost() { - // tqinvalidate all dynamic costs + // invalidate all dynamic costs TraceObjectMap::Iterator oit; for ( oit = _objectMap.begin(); oit != _objectMap.end(); ++oit ) - (*oit).tqinvalidate(); + (*oit).invalidate(); TraceClassMap::Iterator cit; for ( cit = _classMap.begin(); cit != _classMap.end(); ++cit ) - (*cit).tqinvalidate(); + (*cit).invalidate(); TraceFileMap::Iterator fit; for ( fit = _fileMap.begin(); fit != _fileMap.end(); ++fit ) - (*fit).tqinvalidate(); + (*fit).invalidate(); TraceFunctionMap::Iterator it; for ( it = _functionMap.begin(); @@ -4670,7 +4670,7 @@ void TraceData::invalidateDynamicCost() (*it).invalidateDynamicCost(); } - tqinvalidate(); + invalidate(); } @@ -5043,7 +5043,7 @@ void TraceData::updateFunctionCycles() cycle->setup(); _inFunctionCycleUpdate = false; - // we have to tqinvalidate costs because cycles are now taken into account + // we have to invalidate costs because cycles are now taken into account invalidateDynamicCost(); #if 0 diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h index cb97e623..8fab2b68 100644 --- a/kcachegrind/kcachegrind/tracedata.h +++ b/kcachegrind/kcachegrind/tracedata.h @@ -307,7 +307,7 @@ public: * other cost items. If only one item depends on the cost of this item, * it can by set with setDependant() without a need for overwriting. */ - virtual void tqinvalidate(); + virtual void invalidate(); /** * Sets a dependant to be invalidated when this cost is invalidated. @@ -388,7 +388,7 @@ public: void maxCost(int index, SubCost value); TraceCost diff(TraceCost* item); - virtual void tqinvalidate(); + virtual void invalidate(); /** Returns a sub cost. This automatically triggers * a call to update() if needed. @@ -1549,7 +1549,7 @@ class TraceAssoziation bool setFunction(TraceFunction*); TraceFunction* function() { return _function; } - void tqinvalidate() { _valid = false; } + void invalidate() { _valid = false; } bool isValid() { return _valid; } /** @@ -1562,7 +1562,7 @@ class TraceAssoziation * Invalidate all assoziations in TraceFunctions of data with * rtti runtime info. rtti = 0: Invalidate ALL assoziations. */ - static void tqinvalidate(TraceData* data, int rtti); + static void invalidate(TraceData* data, int rtti); protected: TraceFunction* _function; @@ -1590,7 +1590,7 @@ class TraceFunction: public TraceCostItem virtual CostType type() const { return Function; } virtual void update(); - // this tqinvalidate all subcosts of function depending on + // this invalidate all subcosts of function depending on // active status of parts void invalidateDynamicCost(); @@ -1841,7 +1841,7 @@ class TraceData: public TraceCost void load(const TQString&); /** returns true if something changed. These do NOT - * tqinvalidate the dynamic costs on a activation change, + * invalidate the dynamic costs on a activation change, * i.e. all cost items dependend on active parts. * This has to be done by the caller when true is returned by * calling invalidateDynamicCost(). diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp index e2f5ee09..d11f02b6 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d) { _newData = d; - // tqinvalidate all pointers to old data + // invalidate all pointers to old data _activeItem = _newActiveItem = 0; _selectedItem = _newSelectedItem = 0; _costType = _newCostType = 0; diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp index 52e1a83f..797e3a5f 100644 --- a/kcachegrind/kcachegrind/treemap.cpp +++ b/kcachegrind/kcachegrind/treemap.cpp @@ -759,7 +759,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _parent = parent; _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TreeMapItem::~TreeMapItem() { - if (_tqchildren) delete _tqchildren; + if (_children) delete _children; if (_freeRects) delete _freeRects; // finally, notify widget about deletion @@ -845,18 +845,18 @@ void TreeMapItem::redraw() void TreeMapItem::clear() { - if (_tqchildren) { + if (_children) { // delete selected items below this item from selection if (_widget) _widget->clearSelection(this); - delete _tqchildren; - _tqchildren = 0; + delete _children; + _children = 0; } } -// invalidates current tqchildren and forces redraw -// this is only usefull when tqchildren are created on demand in items() +// invalidates current children and forces redraw +// this is only usefull when children are created on demand in items() void TreeMapItem::refresh() { clear(); @@ -890,9 +890,9 @@ int TreeMapItem::depth() const bool TreeMapItem::initialized() { - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); return false; } return true; @@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i) { if (!i) return; - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); } i->setParent(this); if (sorting(0) == -1) - _tqchildren->append(i); // preserve insertion order + _children->append(i); // preserve insertion order else - _tqchildren->inSort(i); + _children->inSort(i); } @@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending) _sortAscending = ascending; _sortTextNo = textNo; - if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); + if (_children && _sortTextNo != -1) _children->sort(); } void TreeMapItem::resort(bool recursive) { - if (!_tqchildren) return; + if (!_children) return; - if (_sortTextNo != -1) _tqchildren->sort(); + if (_sortTextNo != -1) _children->sort(); if (recursive) - for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) + for (TreeMapItem* i=_children->first(); i; i=_children->next()) i->resort(recursive); } @@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const return 0; } -TreeMapItemList* TreeMapItem::tqchildren() +TreeMapItemList* TreeMapItem::children() { - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); } - return _tqchildren; + return _children; } void TreeMapItem::clearItemRect() @@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d) TQString TreeMapWidget::defaultFieldType(int f) const { - return i18n("Text %1").tqarg(f+1); + return i18n("Text %1").arg(f+1); } TQString TreeMapWidget::defaultFieldStop(int) const @@ -1508,7 +1508,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { - TreeMapItemList* list = p->tqchildren(); + TreeMapItemList* list = p->children(); if (!list) i = 0; else { @@ -1572,12 +1572,12 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const (i->itemRect().height() <1))) { TreeMapItem* p = i->parent(); if (!p) break; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); idx--; if (idx<0) i = p; else - i = p->tqchildren()->at(idx); + i = p->children()->at(idx); } } return i; @@ -1771,7 +1771,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, i2 = i2->parent(); if (!i2) return changed; - TreeMapItemList* list = commonParent->tqchildren(); + TreeMapItemList* list = commonParent->children(); if (!list) return changed; TreeMapItem* i = list->first(); @@ -1794,7 +1794,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { @@ -1964,12 +1964,12 @@ int nextVisible(TreeMapItem* i) TreeMapItem* p = i->parent(); if (!p || p->itemRect().isEmpty()) return -1; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); if (idx<0) return -1; - while (idx < (int)p->tqchildren()->count()-1) { + while (idx < (int)p->children()->count()-1) { idx++; - TQRect r = p->tqchildren()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1982,12 +1982,12 @@ int prevVisible(TreeMapItem* i) TreeMapItem* p = i->parent(); if (!p || p->itemRect().isEmpty()) return -1; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->tqchildren()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2068,24 +2068,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) int newIdx = goBack ? nextVisible(_current) : prevVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->tqchildren()->at(newIdx), true); + setCurrent(p->children()->at(newIdx), true); } } else if (e->key() == Key_Right) { int newIdx = goBack ? prevVisible(_current) : nextVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->tqchildren()->at(newIdx), true); + setCurrent(p->children()->at(newIdx), true); } } else if (e->key() == Key_Down) { - if (_current->tqchildren() && _current->tqchildren()->count()>0) { + if (_current->children() && _current->children()->count()>0) { int newIdx = _current->index(); if (newIdx<0) - newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; - if (newIdx>=(int)_current->tqchildren()->count()) - newIdx = _current->tqchildren()->count()-1; - newItem = visibleItem(_current->tqchildren()->at(newIdx)); + newIdx = goBack ? (_current->children()->count()-1) : 0; + if (newIdx>=(int)_current->children()->count()) + newIdx = _current->children()->count()-1; + newItem = visibleItem(_current->children()->at(newIdx)); setCurrent(newItem, true); } } @@ -2274,12 +2274,12 @@ void TreeMapWidget::drawItems(TQPainter* p, TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); - TreeMapItemList* list = item->tqchildren(); + TreeMapItemList* list = item->children(); TreeMapItem* i; bool stopDrawing = false; - // only subdivide if there are tqchildren + // only subdivide if there are children if (!list || list->count()==0) stopDrawing = true; @@ -2312,7 +2312,7 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // tqinvalidate rects + // invalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } @@ -2428,7 +2428,7 @@ void TreeMapWidget::drawItems(TQPainter* p, r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height()); } - // set selfRect (not occupied by tqchildren) for tooltip + // set selfRect (not occupied by children) for tooltip item->addFreeRect(sr); if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR " @@ -2566,7 +2566,7 @@ void TreeMapWidget::drawItems(TQPainter* p, kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl; } -// fills area with a pattern if to small to draw tqchildren +// fills area with a pattern if to small to draw children void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { p->setBrush(TQt::Dense4Pattern); @@ -2575,7 +2575,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) i->addFreeRect(r); } -// fills area with a pattern if to small to draw tqchildren +// fills area with a pattern if to small to draw children void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { @@ -2874,10 +2874,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) popup->insertItem(i18n("Border"), bpopup, id+1); bpopup->insertItem(i18n("Correct Borders Only"), id+2); bpopup->insertSeparator(); - bpopup->insertItem(i18n("Width %1").tqarg(0), id+3); - bpopup->insertItem(i18n("Width %1").tqarg(1), id+4); - bpopup->insertItem(i18n("Width %1").tqarg(2), id+5); - bpopup->insertItem(i18n("Width %1").tqarg(3), id+6); + bpopup->insertItem(i18n("Width %1").arg(0), id+3); + bpopup->insertItem(i18n("Width %1").arg(1), id+4); + bpopup->insertItem(i18n("Width %1").arg(2), id+5); + bpopup->insertItem(i18n("Width %1").arg(3), id+6); bpopup->setItemChecked(id+2, skipIncorrectBorder()); bpopup->setItemChecked(id+3, borderWidth()==0); bpopup->setItemChecked(id+4, borderWidth()==1); @@ -2984,7 +2984,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, connect(popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fieldStopActivated(int))); - popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id); + popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); _menuItem = i; bool foundFieldStop = false; @@ -3043,7 +3043,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int area = i->width() * i->height(); popup->insertSeparator(); popup->insertItem(i18n("Area of '%1' (%2)") - .tqarg(i->text(0)).tqarg(area), id+1); + .arg(i->text(0)).arg(area), id+1); if (area == minimalArea()) { popup->setItemChecked(id+1, true); foundArea = true; @@ -3069,9 +3069,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, } popup->insertItem(i18n("Double Area Limit (to %1)") - .tqarg(minimalArea()*2), id+5); + .arg(minimalArea()*2), id+5); popup->insertItem(i18n("Halve Area Limit (to %1)") - .tqarg(minimalArea()/2), id+6); + .arg(minimalArea()/2), id+6); } } @@ -3105,7 +3105,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, int d = i->depth(); popup->insertSeparator(); popup->insertItem(i18n("Depth of '%1' (%2)") - .tqarg(i->text(0)).tqarg(d), id+1); + .arg(i->text(0)).arg(d), id+1); if (d == maxDrawingDepth()) { popup->setItemChecked(id+1, true); foundDepth = true; @@ -3115,14 +3115,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, if (maxDrawingDepth()>1) { popup->insertSeparator(); if (!foundDepth) { - popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10); + popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10); popup->setItemChecked(id+10, true); } popup->insertItem(i18n("Decrement (to %1)") - .tqarg(maxDrawingDepth()-1), id+2); + .arg(maxDrawingDepth()-1), id+2); popup->insertItem(i18n("Increment (to %1)") - .tqarg(maxDrawingDepth()+1), id+3); + .arg(maxDrawingDepth()+1), id+3); } } @@ -3145,13 +3145,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix) int f, fCount = _attr.size(); config->writeEntry(prefix+"FieldCount", fCount); for (f=0;fwriteEntry(TQString(prefix+"FieldVisible%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f), _attr[f].visible); - config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), _attr[f].forced); - config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), _attr[f].stop); - config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), fieldPositionString(f)); } } @@ -3195,18 +3195,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix) int f; for (f=0;fhasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = TQString(prefix+"FieldForced%1").tqarg(f); + str = TQString(prefix+"FieldForced%1").arg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); setFieldStop(f, str); - str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index a70f5bd4..356c493b 100644 --- a/kcachegrind/kcachegrind/treemap.h +++ b/kcachegrind/kcachegrind/treemap.h @@ -222,7 +222,7 @@ typedef TQPtrListIterator TreeMapItemListIterator; * * If you want more flexibility, reimplement TreeMapItem and * override the corresponding methods. For dynamic creation of child - * items on demand, reimplement tqchildren(). + * items on demand, reimplement children(). */ class TreeMapItem: public StoredDrawParams { @@ -257,7 +257,7 @@ public: // force a redraw of this item void redraw(); - // delete all tqchildren + // delete all children void clear(); // force new child generation & refresh @@ -350,7 +350,7 @@ public: * For value() sorting, use = -2 * * For fast sorting, set this to -1 before child insertions and call - * again after inserting all tqchildren. + * again after inserting all children. */ void setSorting(int textNo, bool ascending = true); @@ -358,18 +358,18 @@ public: * Resort according to the already set sorting. * * This has to be done if the sorting base changes (e.g. text or values - * change). If this is only true for the tqchildren of this item, you can + * change). If this is only true for the children of this item, you can * set the recursive parameter to false. */ void resort(bool recursive = true); virtual SplitMode splitMode() const; virtual int rtti() const; - // not const as this can create tqchildren on demand - virtual TreeMapItemList* tqchildren(); + // not const as this can create children on demand + virtual TreeMapItemList* children(); protected: - TreeMapItemList* _tqchildren; + TreeMapItemList* _children; double _sum, _value; private: @@ -444,7 +444,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected tqchildren or parents stays true. + * has no selected children or parents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -460,7 +460,7 @@ public: void setMarked(int markNo = 1, bool redraw = true); /** - * Clear selection of all selected items which are tqchildren of + * Clear selection of all selected items which are children of * parent. When parent == 0, clears whole selection * Returns true if selection changed. */ @@ -472,7 +472,7 @@ public: * Range means for a hierarchical widget: * - select/unselect i1 and i2 according selected * - search common parent of i1 and i2, and select/unselect the - * range of direct tqchildren between but excluding the child + * range of direct children between but excluding the child * leading to i1 and the child leading to i2. */ void setRangeSelection(TreeMapItem* i1, @@ -532,7 +532,7 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a tqchildren value() is almost the parents sum(), + * If a children value() is almost the parents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the * parent/child size relation can not be mapped to a correct @@ -644,7 +644,7 @@ public: virtual TQString tipString(TreeMapItem* i) const; /** - * Redraws an item with all tqchildren. + * Redraws an item with all children. * This takes changed values(), sums(), colors() and text() into account. */ void redraw(TreeMapItem*); diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp index 50a53424..ddc7fb3e 100644 --- a/kioslave/svn/ksvnd/ksvnd.cpp +++ b/kioslave/svn/ksvnd/ksvnd.cpp @@ -214,7 +214,7 @@ int KSvnd::getStatus( const KURL::List& list ) { external++; } } - if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? + if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? parentshavesvn++; } if ( files > 0 ) diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h index f28db8bb..bf10429c 100644 --- a/kioslave/svn/ksvnd/ksvnd.h +++ b/kioslave/svn/ksvnd/ksvnd.h @@ -32,7 +32,7 @@ class KSvnd : public KDEDModule // TQ_OBJECT K_DCOP - //note: InSVN means tqparent is added. InRepos means itself is added + //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: KSvnd(const TQCString &); diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp index 362852d3..9d06c516 100644 --- a/kioslave/svn/svn.cpp +++ b/kioslave/svn/svn.cpp @@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){ kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); - infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); @@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) { TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) - userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); @@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action switch ( action ) { case svn_wc_notify_add : //add if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).tqarg( path ); + userstring = i18n( "A (bin) %1" ).arg( path ); else - userstring = i18n( "A %1" ).tqarg( path ); + userstring = i18n( "A %1" ).arg( path ); break; case svn_wc_notify_copy: //copy break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).tqarg( path ); + userstring = i18n( "D %1" ).arg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).tqarg( path ); + userstring=i18n( "Restored %1." ).arg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).tqarg( path ); + userstring=i18n( "Reverted %1." ).arg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").tqarg( path ); + userstring=i18n("Skipped missing target %1.").arg( path ); else - userstring=i18n("Skipped %1.").tqarg( path ); + userstring=i18n("Skipped %1.").arg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).tqarg( path ); + userstring=i18n( "D %1" ).arg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).tqarg( path ); + userstring=i18n( "A %1" ).arg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) { if ( nb->in_external ) - userstring = i18n("Exported external at revision %1.").tqarg( revision ); + userstring = i18n("Exported external at revision %1.").arg( revision ); else - userstring = i18n("Exported revision %1.").tqarg( revision ); + userstring = i18n("Exported revision %1.").arg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").tqarg( revision ); + userstring = i18n("Checked out external at revision %1.").arg( revision ); else - userstring = i18n("Checked out revision %1.").tqarg( revision); + userstring = i18n("Checked out revision %1.").arg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").tqarg( revision ); + userstring=i18n("Updated external to revision %1.").arg( revision ); else - userstring = i18n("Updated to revision %1.").tqarg( revision); + userstring = i18n("Updated to revision %1.").arg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").tqarg( revision ); + userstring = i18n("External at revision %1.").arg( revision ); else - userstring = i18n("At revision %1.").tqarg( revision); + userstring = i18n("At revision %1.").arg( revision); } } } else /* no revision */ { @@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_update_external: //update_external nb->in_external = TRUE; - userstring = i18n("Fetching external item into %1." ).tqarg( path ); + userstring = i18n("Fetching external item into %1." ).arg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").tqarg( revision ); + userstring = i18n( "Status against revision: %1.").arg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").tqarg( path ); + userstring = i18n("Performing status on external item at %1.").arg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").tqarg( path ); + userstring = i18n( "Sending %1").arg( path ); break; case svn_wc_notify_commit_added: //commit_added if (mime_type && svn_mime_type_is_binary (mime_type)) { - userstring = i18n( "Adding (bin) %1.").tqarg( path ); + userstring = i18n( "Adding (bin) %1.").arg( path ); } else { - userstring = i18n( "Adding %1.").tqarg( path ); + userstring = i18n( "Adding %1.").arg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").tqarg( path ); + userstring = i18n( "Deleting %1.").arg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").tqarg( path ); + userstring = i18n( "Replacing %1.").arg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index b62c423f..43814746 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int TQString diffStr; if ( modelIndex >= 0 ) - fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 ); + fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 ); else fileStr = i18n( " %n file ", " %n files ", modelCount ); if ( differenceIndex >= 0 ) diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount ) - .tqarg( differenceIndex + 1 ).tqarg( appliedCount ); + .arg( differenceIndex + 1 ).arg( appliedCount ); else diffStr = i18n( " %n difference ", " %n differences ", differenceCount ); diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 1a402260..9f9d775e 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir ) // kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl; KDirLVI* child; if ( ( child = static_cast(this->firstChild()) ) != 0L ) - { // has tqchildren, check if dir already exists, if so addModel + { // has children, check if dir already exists, if so addModel do { if ( dir == child->dirName() ) return child; diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 3c110857..a00a7cb8 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) { if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) { - slotShowError( i18n( "The URL %1 cannot be downloaded." ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 cannot be downloaded." ).arg( url.prettyURL() ) ); tempFileName = ""; } return tempFileName; @@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) return url.path(); else { - slotShowError( i18n( "The URL %1 does not exist on your system." ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 does not exist on your system." ).arg( url.prettyURL() ) ); return tempFileName; } } @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).tqarg( source ); + text = i18n( "Viewing diff output from %1" ).arg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .tqarg( m_info.source.prettyURL() ) - .tqarg( m_info.destination.prettyURL() ); + .arg( m_info.source.prettyURL() ) + .arg( m_info.destination.prettyURL() ); break; default: break; @@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void ) "Format: %3\n" "Number of hunks: %4\n" "Number of differences: %5") - .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) - .tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(oldFile).arg(newFile).arg(diffFormat) + .arg(noOfHunks).arg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } else { // more than 1 file in diff, or 2 directories compared KMessageBox::information( 0L, i18n( @@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void ) "\n" "Number of hunks: %5\n" "Number of differences: %6") - .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) - .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(filesInDiff).arg(diffFormat).arg(oldFile) + .arg(newFile).arg(noOfHunks).arg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } } diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index aa35fc7f..2bccc48b 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index cc114859..30e65d87 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply ) TQPtrDictIterator it ( m_itemDict ); for( ; it.current(); ++it ) it.current()->applyDifference( apply ); - tqrepaint(); + repaint(); } void KompareListView::slotApplyDifference( const Difference* diff, bool apply ) @@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply ) kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl; setVisibility(); setup(); - tqrepaint(); + repaint(); } int KompareListViewDiffItem::maxHeight() @@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b ) m_sourceItem->firstChild() : m_destItem->firstChild(); while( item && item->isVisible() ) { - item->tqrepaint(); + item->repaint(); item = item->nextSibling(); } } diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 7636a27f..47cfc893 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -83,7 +83,7 @@ Command Line - + AlignVCenter|AlignLeft diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 009156cd..f91ac6bc 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w ) if ( isCollapsed(w) ) { return toggle( w, w->pos() ) - TQPoint( 1, 1 ); } else { - return w->tqgeometry().bottomRight(); + return w->geometry().bottomRight(); } } @@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles() TQSplitterLayoutStruct *curr; for ( curr = d->list.first(); curr; curr = d->list.next() ) if ( curr->isHandle ) - ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint(); + ((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint(); } // Scrolling stuff diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp index a2061a2b..43d6e933 100644 --- a/kompare/libdialogpages/pagebase.cpp +++ b/kompare/libdialogpages/pagebase.cpp @@ -37,7 +37,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) { // // The size is computed by adding the sizeHint().height() of all - // widget tqchildren and taking the width of the widest child and adding + // widget children and taking the width of the widest child and adding // tqlayout()->margin() and tqlayout()->spacing() // diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index 3fbd082e..3b48d796 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -98,10 +98,10 @@ TQString DiffHunk::recreateHunk() const // recreate header hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .tqarg( m_sourceLine ) - .tqarg( m_destinationLine ) - .tqarg( slc ) - .tqarg( dlc ); + .arg( m_sourceLine ) + .arg( m_destinationLine ) + .arg( slc ) + .arg( dlc ); if ( !m_function.isEmpty() ) hunk += " " + m_function; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index c300755b..1b3822b0 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -154,11 +154,11 @@ TQString DiffModel::recreateDiff() const // recreate header TQString tab = TQString::fromLatin1( "\t" ); TQString nl = TQString::fromLatin1( "\n" ); - diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); + diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); + diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 89912eac..90aff45b 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).arg( diff ) ); return false; } @@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( !blendOriginalIntoModelList( file ) ) { kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl; - emit( i18n( "There were problems applying the diff %1 to the file %2." ).tqarg( diff ).tqarg( file ) ); + emit( i18n( "There were problems applying the diff %1 to the file %2." ).arg( diff ).arg( file ) ); return false; } @@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).arg( diff ) ); return false; } @@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff { // Trouble blending the original into the model kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl; - emit error( i18n( "There were problems applying the diff %1 to the folder %2." ).tqarg( diff ).tqarg( dir ) ); + emit error( i18n( "There were problems applying the diff %1 to the folder %2." ).arg( diff ).arg( dir ) ); return false; } @@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) temp->close(); if( temp->status() != 0 ) { - emit error( i18n( "Could not write to the temporary file %1, deleting it." ).tqarg( temp->name() ) ); + emit error( i18n( "Could not write to the temporary file %1, deleting it." ).arg( temp->name() ) ); temp->unlink(); delete temp; return false; @@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) if ( !result ) { - emit error( i18n( "Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually copy it to the right place." ).tqarg( m_destination ).tqarg( temp->name() ) ); + emit error( i18n( "Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually copy it to the right place." ).arg( m_destination ).arg( temp->name() ) ); } else { diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp index a432f177..8d099a94 100644 --- a/kspy/propsview.cpp +++ b/kspy/propsview.cpp @@ -35,15 +35,15 @@ public: } protected: void paintCell( TQPainter * p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if (column == 1 && text(2) == "TQColor") { TQColorGroup color_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), TQColor(text(1)), TQColor(text(1)) ); - TQListViewItem::paintCell(p, color_cg, column, width, tqalignment); + TQListViewItem::paintCell(p, color_cg, column, width, alignment); } else { - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } } }; @@ -95,20 +95,20 @@ void PropsView::buildList( TQObject *o ) case TQVariant::Cursor: { TQCursor c = v.toCursor(); - val = TQString("tqshape=%1").tqarg(c.tqshape()); + val = TQString("shape=%1").arg(c.shape()); break; } case TQVariant::Font: { TQFont f = v.toFont(); val = TQString("family=%1, pointSize=%2, weight=%3, italic=%4, bold=%5, underline=%6, strikeOut=%7") - .tqarg(f.family()) - .tqarg(f.pointSize()) - .tqarg(f.weight()) - .tqarg(f.italic()) - .tqarg(f.bold()) - .tqarg(f.underline()) - .tqarg(f.strikeOut()); + .arg(f.family()) + .arg(f.pointSize()) + .arg(f.weight()) + .arg(f.italic()) + .arg(f.bold()) + .arg(f.underline()) + .arg(f.strikeOut()); break; } case TQVariant::Int: @@ -116,39 +116,39 @@ void PropsView::buildList( TQObject *o ) if (mp->isEnumType()) { #ifdef USE_QT4 // TQMetaObject * metaObject = *(mp->meta); // FIXME - val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt())); // FIXME + val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt())); // FIXME #else // USE_QT4 TQMetaObject * metaObject = *(mp->meta); - val = TQString("%1::%2").tqarg(metaObject->className()).tqarg(mp->valueToKey(val.toInt())); + val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt())); #endif // USE_QT4 } break; case TQVariant::Point: { TQPoint p = v.toPoint(); - val = TQString("x=%1, y=%2").tqarg(p.x()).tqarg(p.y()); + val = TQString("x=%1, y=%2").arg(p.x()).arg(p.y()); break; } case TQVariant::Rect: { TQRect r = v.toRect(); val = TQString("left=%1, right=%2, top=%3, bottom=%4") - .tqarg(r.left()) - .tqarg(r.right()) - .tqarg(r.top()) - .tqarg(r.bottom()); + .arg(r.left()) + .arg(r.right()) + .arg(r.top()) + .arg(r.bottom()); break; } case TQVariant::Size: { TQSize s = v.toSize(); - val = TQString("width=%1, height=%2").tqarg(s.width()).tqarg(s.height()); + val = TQString("width=%1, height=%2").arg(s.width()).arg(s.height()); break; } case TQVariant::SizePolicy: { TQSizePolicy s = v.toSizePolicy(); - val = TQString("horData=%1, verData=%2").tqarg(s.horData()).tqarg(s.verData()); + val = TQString("horData=%1, verData=%2").arg(s.horData()).arg(s.verData()); break; } case TQVariant::Double: diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp index 0ad6f4cd..b9ff68b1 100644 --- a/kspy/receiversview.cpp +++ b/kspy/receiversview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - tqreceiversview.cpp - description + receiversview.cpp - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale @@ -28,7 +28,7 @@ class UnencapsulatedTQObject : public TQObject { public: - TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); } + TQConnectionList *public_receivers(int signal) const { return receivers(signal); } }; ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name) @@ -54,7 +54,7 @@ void ReceiversView::buildList( TQObject *o ) TQStrList signalNames = mo->signalNames(true); for (int sig = 0; sig < mo->numSignals(true); sig++) { - TQConnectionList * clist = qobject->public_tqreceivers(sig); + TQConnectionList * clist = qobject->public_receivers(sig); if (clist != 0) { KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) ); diff --git a/kspy/receiversview.h b/kspy/receiversview.h index 6e703472..a0498b67 100644 --- a/kspy/receiversview.h +++ b/kspy/receiversview.h @@ -1,5 +1,5 @@ /*************************************************************************** - tqreceiversview.h - description + receiversview.h - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale diff --git a/kspy/spy.cpp b/kspy/spy.cpp index 1ef024d0..dc30f73f 100644 --- a/kspy/spy.cpp +++ b/kspy/spy.cpp @@ -66,7 +66,7 @@ Spy::Spy( TQWidget *parent, const char *name ) mSigSlotView = new SigSlotView( tabs, "signals and slots view" ); tabs->addTab( mSigSlotView, i18n( "Signals && Slots" ) ); - mReceiversView = new ReceiversView( tabs, "tqreceivers view" ); + mReceiversView = new ReceiversView( tabs, "receivers view" ); tabs->addTab( mReceiversView, i18n( "Receivers" ) ); mClassInfoView = new ClassInfoView( tabs, "class info view" ); diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index 90fb8ea5..f2ae01cb 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -153,7 +153,7 @@ void KUIViewer::takeScreenshot(const TQCString &filename, int w, int h){ // resize widget to the desired size m_part->widget()->setMinimumSize(w, h); m_part->widget()->setMaximumSize(w, h); - m_part->widget()->tqrepaint(); + m_part->widget()->repaint(); // resize app to be as large as desired size adjustSize(); // Disable the saving of the size diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp index b932041e..7dc67e09 100644 --- a/kunittest/runnergui.cpp +++ b/kunittest/runnergui.cpp @@ -162,13 +162,13 @@ namespace KUnitTest if ( Runner::self()->numberOfTests() > 0 ) m_testerWidget->resultsLabel()->setText( TQString("Test cases: %1 | Tests performed: %5, Skipped: %4 | Passed: %2, Failed: %3") - .tqarg(Runner::self()->numberOfTestCases()) - .tqarg(Runner::self()->numberOfPassedTests()) - .tqarg(Runner::self()->numberOfFailedTests()) - .tqarg(Runner::self()->numberOfSkippedTests()) - .tqarg(Runner::self()->numberOfTests()) ); + .arg(Runner::self()->numberOfTestCases()) + .arg(Runner::self()->numberOfPassedTests()) + .arg(Runner::self()->numberOfFailedTests()) + .arg(Runner::self()->numberOfSkippedTests()) + .arg(Runner::self()->numberOfTests()) ); else - m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").tqarg(Runner::self()->numberOfTestCases())); + m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").arg(Runner::self()->numberOfTestCases())); } void RunnerGUI::addTestResult(const char *name, Tester *test) diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp index 7eb883c2..a36ffd15 100644 --- a/poxml/antlr/antlr/AST.hpp +++ b/poxml/antlr/antlr/AST.hpp @@ -59,7 +59,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector findAll(RefAST t)=0; virtual ANTLR_USE_NAMESPACE(std)vector findAllPartial(RefAST t)=0; - /** Get the first child of this node; null if no tqchildren */ + /** Get the first child of this node; null if no children */ virtual RefAST getFirstChild() const=0; /** Get the next sibling in line after this one */ virtual RefAST getNextSibling() const=0; diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp index f83bec10..584cee6d 100644 --- a/poxml/antlr/antlr/ASTFactory.hpp +++ b/poxml/antlr/antlr/ASTFactory.hpp @@ -90,7 +90,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp index bf1e1629..7b93c1ef 100644 --- a/poxml/antlr/antlr/BaseAST.hpp +++ b/poxml/antlr/antlr/BaseAST.hpp @@ -70,7 +70,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector findAll(RefAST t); virtual ANTLR_USE_NAMESPACE(std)vector findAllPartial(RefAST t); - /** Get the first child of this node; null if no tqchildren */ + /** Get the first child of this node; null if no children */ virtual RefAST getFirstChild() const; /** Get the next sibling in line after this one */ virtual RefAST getNextSibling() const; @@ -80,7 +80,7 @@ public: /** Get the token type for this node */ virtual int getType() const; - /** Remove all tqchildren */ + /** Remove all children */ virtual void removeChildren(); /** Set the first child of a node. */ diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp index 66902522..e44386f7 100644 --- a/poxml/antlr/src/ASTFactory.cpp +++ b/poxml/antlr/src/ASTFactory.cpp @@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all tqchildren of root. + // copy all children of root. if (t) { result->setFirstChild( dupList(t->getFirstChild()) ); } @@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t) } /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ @@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector nodes) if (root) { root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set } - // link in tqchildren; + // link in children; for (unsigned int i=1; iequalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any tqchildren for matches + // regardless of match or not, check any children for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on tqchildren. + // if roots match, do partial list match test on children. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on tqchildren. + // if roots match, do full list partial match test on children. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; diff --git a/poxml/parser.cpp b/poxml/parser.cpp index 24b7b4cf..e15778b6 100644 --- a/poxml/parser.cpp +++ b/poxml/parser.cpp @@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName) bool StructureParser::skippedEntity ( const TQString & name ) { if (inside) - message += TQString("&%1;").tqarg(name); + message += TQString("&%1;").arg(name); return true; } @@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& , { TQString tmp = "<" + tname; for (int i = 0; i < attr.length(); i++) { - tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i)); + tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i)); } - tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); - tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); + tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); + tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); if (isSingleTag(qName)) tmp += "/>"; @@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag) uint index = 0; while (true) { - int nextclose = message.find(TQRegExp(TQString::fromLatin1("]").tqarg(tag)), index); - int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").tqarg(tag)), index); + int nextclose = message.find(TQRegExp(TQString::fromLatin1("]").arg(tag)), index); + int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index); // qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside); if (nextclose == -1) { #ifdef POXML_DEBUG @@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message) bool lastws = false; while (index < message.length()) { - switch (message.tqat(index).latin1()) { + switch (message.at(index).latin1()) { case '\n': case '\t': case '\r': @@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const { int slen = strlen(singletags[index]); - if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").tqarg(singletags[index]) && + if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) && !msg.msgid.at( slen + 1 ).isLetterOrNumber() ) { #ifdef POXML_DEBUG @@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) #endif // the exception for poxml_* attributes is made in the closing tag - int closing_index = message.find(TQRegExp(TQString::fromLatin1("]").tqarg(tag)), + int closing_index = message.find(TQRegExp(TQString::fromLatin1("]").arg(tag)), strindex); - int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)), + int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), strindex); #ifdef POXML_DEBUG @@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside); #endif - int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("]").tqarg(tag)), + int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("]").arg(tag)), strindex - 1); - int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)), + int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), strindex - 1); #ifdef POXML_DEBUG @@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr if (inside) { if (!isSingleTag(qName)) { - message += TQString("lineNumber()); - message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); + message += TQString("lineNumber()); + message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); message += ">"; } } @@ -713,8 +713,8 @@ void StructureParser::cleanupTags( TQString &contents ) contents.replace(TQRegExp("&"), "!POXML_AMP!"); for (int index = 0; literaltags[index]; index++) { - TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index])); - TQRegExp end(TQString("]").tqarg(literaltags[index])); + TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index])); + TQRegExp end(TQString("]").arg(literaltags[index])); int strindex = 0; while (true) { strindex = contents.find(start, strindex); @@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString tag = unclosed.cap(1); - contents.replace(index, unclosed.matchedLength(), TQString("").tqarg(tag)); + contents.replace(index, unclosed.matchedLength(), TQString("").arg(tag)); } TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>"); @@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents ) TQString tag = start.cap(1); TQString cut = start.capturedTexts().last(); // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1()); - contents.replace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut)); + contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut)); } TQRegExp singletag("<(\\w*)\\s([^><]*)/>"); @@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents ) break; TQString tag = singletag.cap(1); if (!StructureParser::isSingleTag(tag)) { - contents.replace(index, singletag.matchedLength(), TQString("<%1 %2>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag)); + contents.replace(index, singletag.matchedLength(), TQString("<%1 %2>").arg(tag).arg(singletag.cap(2)).arg(tag)); } } @@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString msgid = trans_comment.cap(1); - contents.replace(index, trans_comment.matchedLength(), TQString("%1").tqarg(msgid)); + contents.replace(index, trans_comment.matchedLength(), TQString("%1").arg(msgid)); } #ifdef POXML_DEBUG @@ -788,7 +788,7 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag) { // qDebug("cont %s %s", contents.latin1(), tag.latin1()); - TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*").tqarg(tag).tqarg(tag)); + TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*").arg(tag).arg(tag)); int strindex = 0; while (true) { strindex = contents.find(empty, strindex); @@ -938,7 +938,7 @@ MsgList parseXML(const char *filename) TQString replacement = ""; while (contents.at(endindex) != '>' || inside) { - switch (contents.tqat(endindex).latin1()) { + switch (contents.at(endindex).latin1()) { case '<': inside++; break; case '>': @@ -977,8 +977,8 @@ MsgList parseXML(const char *filename) { TQMap::Iterator found = msgids.find((*it).msgid); if ((*it).msgid.length() < 4) { - (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid + - TQString("").tqarg((*it).tag); + (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid + + TQString("").arg((*it).tag); changed = true; break; } @@ -993,7 +993,7 @@ MsgList parseXML(const char *filename) it2 != english.end(); it2++) { if ((*it2).msgid == msgid) - (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("").tqarg((*it2).tag); + (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("").arg((*it2).tag); } break; } diff --git a/poxml/split.cpp b/poxml/split.cpp index 54217aa2..29104d3e 100644 --- a/poxml/split.cpp +++ b/poxml/split.cpp @@ -112,7 +112,7 @@ int main( int argc, char **argv ) while (tit != translated.end()) { MsgBlock mb; - mb.msgid = TQString::fromLatin1("appended paragraph %1").tqarg(counter++); + mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++); mb.msgstr = (*tit).msgid; mb.lines += (*tit).lines; english.append(mb); diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index b1fb9f9c..787c4221 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -900,10 +900,10 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) return; } - const TQObjectList tqchildren = widget->childrenListObject(); - if (tqchildren.isEmpty()) + const TQObjectList children = widget->childrenListObject(); + if (children.isEmpty()) return; - TQObjectListIterator iter(tqchildren); + TQObjectListIterator iter(children); TQObject* walk; while ((walk = iter.current())) @@ -1846,13 +1846,13 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQCheckBox* checkbox = static_cast(widget); - int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector violations = checkSentenceStyle(checkbox->text()); - renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text()); + renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text()); - drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text()))); if (flags & Style_HasFocus) @@ -1867,13 +1867,13 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQRadioButton* rb = static_cast(widget); - int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector violations = checkSentenceStyle(rb->text()); - renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix, rb->text()); + renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix, rb->text()); - drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text()))); if (flags & Style_HasFocus) @@ -2571,7 +2571,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, } -// Fix TQt's wacky image tqalignment +// Fix TQt's wacky image alignment TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const @@ -2602,12 +2602,12 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if ( (event->type() == TQEvent::Enter) && (button->isEnabled()) ) { hoverWidget = button; - button->tqrepaint( false ); + button->repaint( false ); } else if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->tqrepaint( false ); + button->repaint( false ); } } @@ -2629,14 +2629,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) m = lb->fontMetrics().width('x') / 2 - lb->margin(); if ( m > 0 ) { - int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() ); + int hAlign = TQApplication::horizontalAlignment( lb->alignment() ); if ( hAlign & AlignLeft ) cr.setLeft( cr.left() + m ); if ( hAlign & AlignRight ) cr.setRight( cr.right() - m ); - if ( lb->tqalignment() & AlignTop ) + if ( lb->alignment() & AlignTop ) cr.setTop( cr.top() + m ); - if ( lb->tqalignment() & AlignBottom ) + if ( lb->alignment() & AlignBottom ) cr.setBottom( cr.bottom() - m ); } @@ -2656,17 +2656,17 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if (lb->buddy()) { - renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() ); + renderViolations(violations, &p, cr,lb->alignment() | ShowPrefix, lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } else { - renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() ); + renderViolations(violations, &p, cr,lb->alignment(), lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } @@ -2704,11 +2704,11 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) int h = fm.height(); int tw = fm.width( stripped_title, stripped_title.length() ) + 2*fm.width(TQChar(' ')); int x; - if ( gb->tqalignment() & AlignHCenter ) // center tqalignment + if ( gb->alignment() & AlignHCenter ) // center alignment x = gb->frameRect().width()/2 - tw/2; - else if ( gb->tqalignment() & AlignRight ) // right tqalignment + else if ( gb->alignment() & AlignRight ) // right alignment x = gb->frameRect().width() - tw - 8; - else if ( gb->tqalignment() & AlignLeft ) // left tqalignment + else if ( gb->alignment() & AlignLeft ) // left alignment x = 8; else { // auto align diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index 37017413..eaa63a0c 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -199,7 +199,7 @@ This function does not do any hidden buffer changes." ;; throw it away due to the narrowing that might be done ;; by the function above. That means we must not do any ;; changes during the execution of this function, since - ;; `c-tqinvalidate-state-cache' then would change this local + ;; `c-invalidate-state-cache' then would change this local ;; variable and leave a bogus value in the global one. (c-state-cache (if inclass-p (c-whack-state-before (point-min) paren-state) diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl index 34ce47a0..901fdf12 100755 --- a/scripts/kde-spellcheck.pl +++ b/scripts/kde-spellcheck.pl @@ -373,7 +373,7 @@ Afganistan Afghanistan agressive aggressive Agressive Aggressive agressively aggressively -alignement tqalignment +alignement alignment alligned aligned Allignment Alignment allmost almost @@ -514,7 +514,7 @@ charakters characters charater character Chatacter Character chatwindow chat window -childs tqchildren +childs children choosed chose choosen chosen Choosen Chosen diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index 73951a0f..17efa128 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -3432,7 +3432,7 @@ sub update_module_environment my $path = join(':', "$qtdir/bin", "$tdedir/bin", get_option ($module, 'binpath')); my $libdir = join(':', "$qtdir/lib", "$tdedir/lib", get_option ($module, 'libpath')); - # Set up the tqchildren's environment. We use setenv since it + # Set up the children's environment. We use setenv since it # won't set an environment variable to nothing. (e.g, setting # QTDIR to a blank string might confuse Qt or KDE. diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 2ac38d4e..3aac8342 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) { // at least 2 widgets must be selected if (widgetList.count() > 1) { - // now perform tqalignment according to the clicked button + // now perform alignment according to the clicked button switch (btn) { case alac_align_left: alignLeft(widgetList); @@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) { UMLApp::app()->getDocument()->setModified(); } else { KMessageBox::messageBox(0, KMessageBox::Information, - i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."), + i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."), i18n("Information"), i18n("&OK"), TQString(""), "showAlignInformation"); } // if (widgetList.count() > 1) diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index 7e2170a5..7720b9b3 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -21,10 +21,10 @@ class TQMainWindow; class UMLWidget; /** - * This toolbar provides tools for tqalignment. Widgets can only be aligned, when + * This toolbar provides tools for alignment. Widgets can only be aligned, when * there are at least 2 widgets (not associations) are selected * - * @short Toolbar providing tqalignment tools. + * @short Toolbar providing alignment tools. * @author Sebastian Stein * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ @@ -34,7 +34,7 @@ class AlignToolBar : public KToolBar { public: /** - * Creates a bar with tools for tqalignment. + * Creates a bar with tools for alignment. * * @param parentWindow The parent of the toolbar. * @param name The name of the toolbar. @@ -215,7 +215,7 @@ private: private slots: /** - * Performs the tqalignment when a button was clicked. + * Performs the alignment when a button was clicked. * * @param btn The clicked button. */ diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 6d484307..81a1bb57 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -797,7 +797,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) // BTW, IMHO the concept of a widget being the parent of a UML object // is fundamentally flawed. Widgets are pure presentation - they can // come and go at a whim. If at all, the widgets could be considered - // tqchildren of the corresponding UML object. + // children of the corresponding UML object. // // ANSWER: This is the wrong treatment of cut and paste. Associations that // are being cut/n pasted should be serialized to XMI, then reconstituted diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h index fbbdf214..175a64ec 100644 --- a/umbrello/umbrello/associationwidget.h +++ b/umbrello/umbrello/associationwidget.h @@ -1012,7 +1012,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * tqchildren should make sure that they don't have a menu active or there + * children should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index e47911e6..6b6196d4 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b) void AutolayoutDlg::slotSetShapeSeparation(int i) { - tqshapeSeparation=i; + shapeSeparation=i; } void AutolayoutDlg::slotReloadSettings() @@ -115,7 +115,7 @@ void AutolayoutDlg::slotDoAutotqlayout() a->setGeneralizationWeight( generalizationWeight); a->setNoteConnectionWeight( 1); a->setNoteConnectionsAsEdges(true); - a->setShapeSeparation( tqshapeSeparation); + a->setShapeSeparation( shapeSeparation); a->autotqlayout( view); delete a; a=0; @@ -134,7 +134,7 @@ void AutolayoutDlg::readConfig( KConfig * conf) generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true))); generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1))); associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0))); - tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0))); + shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0))); algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0))); } @@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf) conf->writeEntry("generalizationWeight",generalizationEdgessSL->value()); conf->writeEntry("associationWeight",associationEdgesSL->value()); - conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value()); + conf->writeEntry("shapeSeparation",shapeSeparationSB->value()); //conf->writeEntry("al diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index f2614d03..a5e4117a 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -54,7 +54,7 @@ class AutolayoutDlg : public MyDialog1 bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int tqshapeSeparation; + int shapeSeparation; KConfig* config; TQString algname; Autotqlayout::Autolayouter* getAutolayouter(); diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp index 3a245cbc..30f3fad7 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -118,7 +118,7 @@ void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i ) { - tqshapeSeparation=i; + shapeSeparation=i; } Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view ) diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 1d05f0d2..49e71803 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -70,7 +70,7 @@ protected: bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int tqshapeSeparation; + int shapeSeparation; int noteConnectionWeight; bool noteConnectionAsEdges; bool anchorsAsEdges; diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp index a3b4ea8a..36a50170 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.cpp +++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp @@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph() a_weight= agedgeattr(_agraph,"weight",""); agnodeattr(_agraph, "fixedsize", "true"); agnodeattr(_agraph, "margin", "0.01,0.01"); - agnodeattr(_agraph, "tqshape", "box"); + agnodeattr(_agraph, "shape", "box"); agraphattr(_agraph, "dpi", "DPI/0"); diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index bca63027..af2e3db5 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -88,12 +88,12 @@ Shape separation - tqshapeSeparationSB + shapeSeparationSB - tqshapeSeparationSB + shapeSeparationSB @@ -450,7 +450,7 @@ setEnabled(bool) - tqshapeSeparationSB + shapeSeparationSB valueChanged(int) MyDialog1 slotSetShapeSeparation(int) diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp index d654e083..069ba84b 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.cpp +++ b/umbrello/umbrello/clipboard/umlclipboard.cpp @@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra } } -/** Adds the tqchildren of a UMLListViewItem to m_ItemList */ +/** Adds the children of a UMLListViewItem to m_ItemList */ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) { if(Item->childCount()) { UMLListViewItem * child = (UMLListViewItem*)Item->firstChild(); @@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) { return true; lv->setStartedCopy(false); /* If we get here we are pasting after a Copy and need to - // paste possible tqchildren. + // paste possible children. UMLListViewItem* itemdata = 0; UMLListViewItemListIt it(itemdatalist); while ( (itemdata=it.current()) != 0 ) { @@ -630,7 +630,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { break; } default : - kWarning() << "pasting unknown tqchildren type in clip type 5" << endl; + kWarning() << "pasting unknown children type in clip type 5" << endl; return false; } } diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h index b0607ef2..017a4beb 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.h +++ b/umbrello/umbrello/clipboard/umlclipboard.h @@ -167,13 +167,13 @@ private: bool& OnlyAttsOps); /** - * Adds the tqchildren of a UMLListViewItem to m_ItemList. + * Adds the children of a UMLListViewItem to m_ItemList. */ bool insertItemChildren(UMLListViewItem* Item, UMLListViewItemList& SelectedItems); /** - * Inserts the data of the tqchildren of the given item + * Inserts the data of the children of the given item * into the item data list. Used for clip type 4. Used * to make * sure classes have all the attributes and * operations saved. @@ -181,7 +181,7 @@ private: bool insertItemChildren(UMLListViewItem* item); /** - * Pastes the tqchildren of a UMLListViewItem (The Parent) + * Pastes the children of a UMLListViewItem (The Parent) */ bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog); diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index 44a65c62..41ac6ed2 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) { TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory(); file.setName(outputDirectory.absFilePath(fileName)); if(!file.open(IO_WriteOnly)) { - KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File")); + KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File")); return false; } return true; diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp index d58ceae4..e748333d 100644 --- a/umbrello/umbrello/codegenerators/cppwriter.cpp +++ b/umbrello/umbrello/codegenerators/cppwriter.cpp @@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs, // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. methodBaseName = methodBaseName.stripWhiteSpace(); - methodBaseName.replace(0,1,methodBaseName.tqat(0).upper()); + methodBaseName.replace(0,1,methodBaseName.at(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), varName, methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod, diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp index 180ba176..42b055e5 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML TQString roleName = cleanName(a->getRoleName(Uml::B)); TQString typeName = cleanName(o->getName()); if (roleName.isEmpty()) { - roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++); + roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++); } TQString roleDoc = a->getRoleDoc(Uml::B); diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index 19f3c1fd..db6d6515 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. fieldName.stripWhiteSpace(); - fieldName.replace(0,1,fieldName.tqat(0).upper()); + fieldName.replace(0,1,fieldName.at(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), cleanName(at->getName()), diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index f0de28a3..64a01b47 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -173,7 +173,7 @@ static const char *php5words[] = "checkout", "chgrp", "child_nodes", - "tqchildren", + "children", "chmod", "chop", "chown", @@ -760,8 +760,8 @@ static const char *php5words[] = "getrusage", "getservbyname", "getservbyport", - "gettqshape1", - "gettqshape2", + "getshape1", + "getshape2", "gettext", "gettimeofday", "gettype", @@ -2704,7 +2704,7 @@ static const char *php5words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endtqshape", + "swf_endshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2738,21 +2738,21 @@ static const char *php5words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_tqshapearc", - "swf_tqshapecurveto", - "swf_tqshapecurveto3", - "swf_tqshapefillbitmapclip", - "swf_tqshapefillbitmaptile", - "swf_tqshapefilloff", - "swf_tqshapefillsolid", - "swf_tqshapelinesolid", - "swf_tqshapelineto", - "swf_tqshapemoveto", + "swf_shapearc", + "swf_shapecurveto", + "swf_shapecurveto3", + "swf_shapefillbitmapclip", + "swf_shapefillbitmaptile", + "swf_shapefilloff", + "swf_shapefillsolid", + "swf_shapelinesolid", + "swf_shapelineto", + "swf_shapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_starttqshape", + "swf_startshape", "swf_startsymbol", "SWFText", "SWFTextField", diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index f7e1e76e..e9dba103 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -171,7 +171,7 @@ static const char *words[] = "checkout", "chgrp", "child_nodes", - "tqchildren", + "children", "chmod", "chop", "chown", @@ -758,8 +758,8 @@ static const char *words[] = "getrusage", "getservbyname", "getservbyport", - "gettqshape1", - "gettqshape2", + "getshape1", + "getshape2", "gettext", "gettimeofday", "gettype", @@ -2700,7 +2700,7 @@ static const char *words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endtqshape", + "swf_endshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2734,21 +2734,21 @@ static const char *words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_tqshapearc", - "swf_tqshapecurveto", - "swf_tqshapecurveto3", - "swf_tqshapefillbitmapclip", - "swf_tqshapefillbitmaptile", - "swf_tqshapefilloff", - "swf_tqshapefillsolid", - "swf_tqshapelinesolid", - "swf_tqshapelineto", - "swf_tqshapemoveto", + "swf_shapearc", + "swf_shapecurveto", + "swf_shapecurveto3", + "swf_shapefillbitmapclip", + "swf_shapefillbitmaptile", + "swf_shapefilloff", + "swf_shapefillsolid", + "swf_shapelinesolid", + "swf_shapelineto", + "swf_shapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_starttqshape", + "swf_startshape", "swf_startsymbol", "SWFText", "SWFTextField", diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp index f2bf7a66..8c043a3e 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp @@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc } } -// all that matters here is roleA, the role served by the tqchildren of this class +// all that matters here is roleA, the role served by the children of this class // in any composition or aggregation association. In full associations, I have only // considered the case of "self" association, so it shouldn't matter if we use role A or // B to find the child class as long as we don't use BOTH roles. I bet this will fail diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h index cc4372a2..cb5546d8 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.h +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h @@ -88,7 +88,7 @@ private: /** * write a declaration for this classifier. Used for interfaces to classes with - * inheriting tqchildren. + * inheriting children. */ void writeGroupClassifierDecl(UMLClassifier *c, UMLClassifierList superclassifiers, diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp index 0c689e1e..c3fb2fd6 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp +++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp @@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa return this; // shouldn't happen unless the textblock doesn't exist in this object - // or its tqchildren at all + // or its children at all return (CodeGenObjectWithTextBlocks*) NULL; } @@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root) // in this vanilla version, we only load comments and codeblocks // as they are the only instanciatable (vanilla) things // this method should be overridden if this class is inherited -// by some other class that is concrete and takes tqchildren +// by some other class that is concrete and takes children // derived from codeblock/codecomment void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root) { diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h index b8f50454..7bf338f2 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.h +++ b/umbrello/umbrello/codegenobjectwithtextblocks.h @@ -165,7 +165,7 @@ protected: * in this vanilla version, we only load comments and codeblocks * as they are the only instanciatable (vanilla) things * this method should be overridden if this class is inherited - * by some other class that is concrete and takes tqchildren + * by some other class that is concrete and takes children * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock */ virtual void loadChildTextBlocksFromNode ( TQDomElement & root); diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp index 469e4030..e32758dd 100644 --- a/umbrello/umbrello/codeimport/classimport.cpp +++ b/umbrello/umbrello/codeimport/classimport.cpp @@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) { fileIT != fileList.end(); ++fileIT) { TQString fileName = (*fileIT); umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3"). - tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size())); + arg(fileName).arg(processedFilesCount).arg(fileList.size())); parseFile(fileName); processedFilesCount++; } diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 4e38a1aa..6b87f493 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, /* We know std and TQt are namespaces */ if (scopeName != "std" && scopeName != "TQt") { wantNamespace = KMessageBox::questionYesNo(NULL, - i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName), + i18n("Is the scope %1 a namespace or a class?").arg(scopeName), i18n("C++ Import Requests Your Help"), i18n("Namespace"), i18n("Class")); } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index 4dba6be5..2c962e5d 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -128,7 +128,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_tqchildren.setAutoDelete( false ); + m_children.setAutoDelete( false ); #endif } @@ -188,12 +188,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_tqchildren.append( child ); + m_children.append( child ); } void AST::removeChild( AST* child ) { - m_tqchildren.remove( child ); + m_children.remove( child ); } #endif diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index 49520e33..3c96da9e 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -232,7 +232,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList tqchildren() { return m_tqchildren; } + TQPtrList children() { return m_children; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -266,7 +266,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList m_tqchildren; + TQPtrList m_children; #endif TQString m_comment; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 679e0f90..44c10f82 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column ) if( (line > startLine || (line == startLine && column >= startColumn)) && (line < endLine || (line == endLine && column < endColumn)) ){ - TQPtrList tqchildren = node->tqchildren(); - TQPtrListIterator it( tqchildren ); + TQPtrList children = node->children(); + TQPtrListIterator it( children ); while( it.current() ){ AST* a = it.current(); ++it; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index 7054e1a4..38561d53 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -374,7 +374,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn ); + //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); // str = TQString(); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index 51837b1e..b724faba 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ return false; \ } \ lex->nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ } \ else \ lex->nextToken(); \ @@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); } return true; diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h index e9c81525..718944cc 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.h +++ b/umbrello/umbrello/dialogs/classoptionspage.h @@ -23,7 +23,7 @@ class ClassifierWidget; /** * A dialog page to display options for a @ref UMLWidget and its - * tqchildren. This is not normally called by you. It is used by + * children. This is not normally called by you. It is used by * the @ref ClassPropDlg. * * @short A dialog page to display the options for a UMLWidget. diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index 30ab5817..b64e30dc 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -159,7 +159,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) { if(!info.exists()) { if (KMessageBox::questionYesNo(this, - i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()), + i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()), i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { TQDir dir; @@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) { // it exits and we can write... make sure it is a directory if(!info.isDir()) { - KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()), + KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()), i18n("Please Choose Valid Folder")); return; } diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 34176e3a..8374def4 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap& opts, bool /*inclde for(int i=0;i isSelected(i)) { UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]); - TQString sCount = TQString("%1").tqarg(count); - TQString sID = TQString("%1").tqarg(ID2STR(view -> getID())); + TQString sCount = TQString("%1").arg(count); + TQString sID = TQString("%1").arg(ID2STR(view -> getID())); opts.insert(diagram + sCount, sID); count++; } } - opts.insert("kde-uml-count", TQString("%1").tqarg(count)); + opts.insert("kde-uml-count", TQString("%1").arg(count)); } void DiagramPrintPage::setOptions( const TQMap& /*opts*/ ) {} diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index 9088b794..0c7aabd3 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -28,7 +28,7 @@ KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() ); + TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() ); tqlayout->addWidget(dialogueLabel); m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() ); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index e8216b99..a1be7a6f 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -463,7 +463,7 @@ bool UMLOperationDialog::apply() if( classifier != 0L && classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) ) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index e577a6c3..41bf5d12 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -96,7 +96,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error")); return false; } umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index 127c3b34..1c608d8f 100644 --- a/umbrello/umbrello/folder.cpp +++ b/umbrello/umbrello/folder.cpp @@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) { bool UMLFolder::loadFolderFile(const TQString& path) { TQFile file(path); if (!file.exists()) { - KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error")); return false; } if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error")); return false; } TQTextStream stream(&file); diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h index 9d36922b..db24fd36 100644 --- a/umbrello/umbrello/messagewidget.h +++ b/umbrello/umbrello/messagewidget.h @@ -209,7 +209,7 @@ public: UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op); /** - * Calculate the tqgeometry of the widget. + * Calculate the geometry of the widget. */ void calculateWidget(); diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index 1826847b..29ba1906 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse #if defined (NOTEWIDGET_EMBED_EDITOR) m_pEditor->setText( getDoc() ); m_pEditor->setShown(true); - m_pEditor->tqrepaint(); + m_pEditor->repaint(); #else if (p == NULL) return; diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h index 7c3da48c..081556ed 100644 --- a/umbrello/umbrello/notewidgetcontroller.h +++ b/umbrello/umbrello/notewidgetcontroller.h @@ -44,7 +44,7 @@ public: /** * Overriden from UMLWidgetController. * Handles a mouse move event. - * Executes base code and then sets the tqgeometry of the editor. + * Executes base code and then sets the geometry of the editor. * * @param me The TQMouseEvent event. */ diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 1986cfa3..193f9545 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -650,7 +650,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV UMLOperation *op = static_cast(movingObject); if(newClassifier->checkOperationSignature(op->getName(), op->getParmList())) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); @@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV // UMLAttribute *att = static_cast(movingObject); // if(!newClassifier->checkAttributeSignature(att)) // { - // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) + // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName()) // + // TQString(i18n("Choose a different name or parameter list." )); // KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 099b72f6..7be8936a 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs() TQDir d = url.path(-1); if(TQFile::exists(d.path())) { - int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite")); + int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite")); if(want_save == KMessageBox::Continue) cont = false; } else @@ -776,7 +776,7 @@ void UMLApp::slotFilePrint() DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc); printer.addDialogPage(selectPage); TQString msg; - if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) { + if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) { m_doc -> print(&printer); } @@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); m_statusLabel->setText( text ); - m_statusLabel->tqrepaint(); + m_statusLabel->repaint(); } void UMLApp::slotClassDiagram() { diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index 3e5b27e7..d9bff6bc 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -340,7 +340,7 @@ protected: /** * Save general Options like all bar positions and status - * as well as the tqgeometry and the recent file list to + * as well as the geometry and the recent file list to * the configuration file. */ void saveOptions(); diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 8f404a86..edf56b23 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KIO::NetAccess::download( url, tmpfile, UMLApp::app() ); TQFile file( tmpfile ); if ( !file.exists() ) { - KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KTar archive(tmpfile, mimetype); if (archive.open(IO_ReadOnly) == false) { - KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { entry = const_cast(rootDir->entry(*it)); if (entry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { fileEntry = dynamic_cast(entry); if (fileEntry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -445,7 +445,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { TQFile xmi_file(tmp_dir.name() + *it); if( !xmi_file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -458,7 +458,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { tmp_dir.unlink(); } else { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -469,7 +469,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { } else { // no, it seems to be an ordinary file if( !file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -485,7 +485,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KIO::NetAccess::removeTempFile( tmpfile ); if( !status ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); m_bLoading = false; newDocument(); return false; @@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // now check if we can write to the file if (archive->open(IO_WriteOnly) == false) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); return false; } @@ -562,7 +562,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { KTempFile tmp_xmi_file; file.setName(tmp_xmi_file.name()); if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); return false; } saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file... @@ -582,7 +582,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { #if KDE_IS_VERSION(3,4,89) if (!archive->closeSucceeded()) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); return false; } #endif @@ -617,7 +617,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); return false; } saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it @@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } else { // now remove the original file if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); return false; } @@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } if( !uploaded ) { - KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); } setModified(false); @@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) { kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { + if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { removeView(umlview); emit sigDiagramRemoved(id); setModified(true); @@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) { for(int i = 0;i < count;i++) { if(i>0) pPrinter -> newPage(); - TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i); + TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i); TQString sID = pPrinter -> option(diagram); Uml::IDType id = STR2ID(sID); printView = findView(id); @@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() { } KURL tempURL = m_doc_url; if( tempURL.fileName() == i18n("Untitled") ) { - tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") ); + tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") ); saveDocument( tempURL ); m_doc_url.setFileName( i18n("Untitled") ); m_modified = true; diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index bdeee008..5db7d670 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) { file.close(); } else { KMessageBox::error(0, - i18n("There was a problem saving file: %1").tqarg(fileName), + i18n("There was a problem saving file: %1").arg(fileName), i18n("Save Error")); return; } @@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) { clearSelection(); triggerUpdate(); } - //tqrepaint(); + //repaint(); TQListView::focusOutEvent(fe); } @@ -2378,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & UMLListViewItem * item = 0; if (nID != Uml::id_None) { // The following is an ad hoc hack for the copy/paste code. - // The clip still contains the old tqchildren although new + // The clip still contains the old children although new // UMLCLassifierListItems have already been created. // If the IDChangeLog finds new IDs this means we are in // copy/paste and need to adjust the child listitems to the diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h index b6bf201c..f2328cef 100644 --- a/umbrello/umbrello/umllistview.h +++ b/umbrello/umbrello/umllistview.h @@ -88,7 +88,7 @@ public: int getSelectedItems(UMLListViewItemList &ItemList); /** - * Get selected items, but only root elements selected (without tqchildren). + * Get selected items, but only root elements selected (without children). * * @param ItemList List of UMLListViewItems returned. * @return The number of selected items. diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index c6a5f954..89bb581c 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) { } default: KMessageBox::error( kapp->mainWidget() , - i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type), + i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type), i18n("Function Not Implemented") ); TQListViewItem::setText(0, m_Label); break; diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h index 596a93f5..1064befc 100644 --- a/umbrello/umbrello/umllistviewitem.h +++ b/umbrello/umbrello/umllistviewitem.h @@ -190,7 +190,7 @@ public: virtual int compare(TQListViewItem *other, int col, bool ascending) const; /** - * Returns the number of tqchildren of the UMLListViewItem + * Returns the number of children of the UMLListViewItem * containing this object */ int childCount() const { @@ -213,7 +213,7 @@ public: /** * Find the UMLListViewItem that represents the given UMLClassifierListItem - * in the tqchildren of the current UMLListViewItem. (Only makes sense if + * in the children of the current UMLListViewItem. (Only makes sense if * the current UMLListViewItem represents a UMLClassifier.) * Return a pointer to the item or NULL if not found. */ diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h index a0e02160..aedc2325 100644 --- a/umbrello/umbrello/umlobject.h +++ b/umbrello/umbrello/umlobject.h @@ -379,7 +379,7 @@ public slots: signals: /** Emitted when the UMLObject has changed. Note that some objects emit - * this signal when one of its tqchildren changes, for example, a UMLClass + * this signal when one of its children changes, for example, a UMLClass * emits a modified() signal when one of its operation changes while the Operation * itself emits the corresponding signal as well. */ diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index 39ef14fb..aef18eca 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -294,7 +294,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { pPainter.translate(offsetX,offsetY); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName()); + TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(0, height + 2, width, height + 2); @@ -354,7 +354,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName()); + TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(rect.x(), footTop , windowWidth, footTop); @@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) { TQString zoom = qElement.attribute( "zoom", "100" ); m_nZoom = zoom.toInt(); - TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); + TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) ); m_nCanvasHeight = height.toInt(); - TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); + TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) ); m_nCanvasWidth = width.toInt(); int nType = type.toInt(); @@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) { while (!e.isNull()) { tag = e.tagName(); kDebug() << "Presentation: tag = " << tag << endl; - if (Uml::tagEq(tag, "Presentation.tqgeometry")) { + if (Uml::tagEq(tag, "Presentation.geometry")) { TQDomNode gnode = e.firstChild(); TQDomElement gelem = gnode.toElement(); TQString csv = gelem.text(); diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h index 8ee2d3df..ce84e17c 100644 --- a/umbrello/umbrello/umlview.h +++ b/umbrello/umbrello/umlview.h @@ -706,7 +706,7 @@ public: void resetPastePoint(); /** - * Called by the view or any of its tqchildren when they start a cut + * Called by the view or any of its children when they start a cut * operation. */ void setStartedCut() { @@ -1120,7 +1120,7 @@ protected: UMLWidgetList m_SelectedList; /** - * Flag if view/tqchildren started cut operation. + * Flag if view/children started cut operation. */ bool m_bStartedCut; diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp index 23164171..c669086d 100644 --- a/umbrello/umbrello/umlviewimageexporter.cpp +++ b/umbrello/umbrello/umlviewimageexporter.cpp @@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() { // check if the file exists if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) { int wantSave = KMessageBox::warningContinueCancel(0, - i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()), + i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()), i18n("File Already Exists"), i18n("&Overwrite")); if (wantSave == KMessageBox::Continue) { exportPrepared = true; diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index a8de3637..155ba9b8 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const { // create the needed directories if (!prepareDirectory(url)) { - return i18n("Can not create directory: %1").tqarg(url.directory()); + return i18n("Can not create directory: %1").arg(url.directory()); } // The fileName will be used when exporting the image. If the url isn't local, @@ -148,14 +148,14 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im // exporting the view to the file if (!exportViewTo(view, imageType, fileName)) { tmpFile.unlink(); - return i18n("A problem occured while saving diagram in %1").tqarg(fileName); + return i18n("A problem occured while saving diagram in %1").arg(fileName); } // if the file wasn't local, upload the temp file to the target if (!url.isLocalFile()) { if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) { tmpFile.unlink(); - return i18n("There was a problem saving file: %1").tqarg(url.path()); + return i18n("There was a problem saving file: %1").arg(url.path()); } } //!isLocalFile @@ -177,7 +177,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt listViewItem = static_cast(listViewItem->parent()); // Relies on the tree structure of the UMLListView. There are a base "Views" folder - // and five tqchildren, one for each view type (Logical, use case, components, deployment + // and five children, one for each view type (Logical, use case, components, deployment // and entity relationship) while (listView->rootView(listViewItem->getType()) == NULL) { name.insert(0, listViewItem->getText() + '/'); @@ -320,7 +320,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r // modify content fileContent.replace(pos,rx.cap(0).length(), - TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top)); + TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top)); ts << fileContent; epsfile.close(); diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h index fd646306..6a74579f 100644 --- a/umbrello/umbrello/umlwidget.h +++ b/umbrello/umbrello/umlwidget.h @@ -667,7 +667,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * tqchildren should make sure that they don't have a menu active or there + * children should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ virtual void slotRemovePopupMenu(); -- cgit v1.2.1

%1
%1 %2 %3 %4
%1%1
%1%1server()->attachmentViewLink( (*it).id ).url() + "\">" + i18n("View") + "