From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:09 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0. --- cervisia/addremovedlg.cpp | 14 +- cervisia/addrepositorydlg.cpp | 20 +- cervisia/annotatectl.cpp | 2 +- cervisia/annotateview.cpp | 4 +- cervisia/annotateview.h | 2 +- cervisia/cervisia.1.in | 8 +- cervisia/cervisia.pod | 6 +- cervisia/cervisiapart.cpp | 18 +- cervisia/cervisiapart.h | 2 +- cervisia/changelogdlg.cpp | 4 +- cervisia/checkoutdlg.cpp | 8 +- cervisia/commitdlg.cpp | 20 +- cervisia/cvsinitdlg.cpp | 2 +- cervisia/cvsservice/repository.cpp | 2 +- cervisia/diffdlg.cpp | 74 +++---- cervisia/diffview.cpp | 10 +- cervisia/diffview.h | 4 +- cervisia/entry.h | 4 +- cervisia/entry_status.cpp | 4 +- cervisia/entry_status.h | 6 +- cervisia/entry_status_change.h | 2 +- cervisia/globalignorelist.cpp | 4 +- cervisia/historydlg.cpp | 12 +- cervisia/ignorelistbase.cpp | 2 +- cervisia/logdlg.cpp | 12 +- cervisia/loginfo.cpp | 22 +- cervisia/loglist.cpp | 8 +- cervisia/logmessageedit.cpp | 4 +- cervisia/logplainview.cpp | 8 +- cervisia/logtree.cpp | 4 +- cervisia/logtree.h | 2 +- cervisia/mergedlg.cpp | 14 +- cervisia/misc.cpp | 8 +- cervisia/patchoptiondlg.cpp | 2 +- cervisia/progressdlg.cpp | 8 +- cervisia/protocolview.cpp | 6 +- cervisia/protocolview.h | 2 +- cervisia/qttableview.cpp | 66 +++--- cervisia/qttableview.h | 14 +- cervisia/repositories.cpp | 2 +- cervisia/repositorydlg.cpp | 20 +- cervisia/resolvedlg.cpp | 66 +++--- cervisia/settingsdlg.cpp | 56 ++--- cervisia/settingsdlg_advanced.ui | 2 +- cervisia/stringmatcher.cpp | 2 +- cervisia/tagdlg.cpp | 12 +- cervisia/tooltip.cpp | 8 +- cervisia/updatedlg.cpp | 18 +- cervisia/updateview.cpp | 16 +- cervisia/updateview.h | 2 +- cervisia/updateview_items.cpp | 28 +-- cervisia/updateview_items.h | 8 +- cervisia/updateview_visitors.cpp | 2 +- cervisia/watchdlg.cpp | 24 +-- cervisia/watchersdlg.cpp | 6 +- kapptemplate/kapp/apppref.cpp | 10 +- kapptemplate/kapp/appview.cpp | 4 +- kapptemplate/kpartapp/app_part.cpp | 2 +- kbabel/addons/kfile-plugins/kfile_po.cpp | 2 +- kbabel/catalogmanager/catalogmanager.cpp | 24 +-- kbabel/catalogmanager/catalogmanagerview.cpp | 92 ++++----- kbabel/catalogmanager/catalogmanagerview.h | 4 +- kbabel/catalogmanager/catmanlistitem.cpp | 54 ++--- kbabel/catalogmanager/catmanlistitem.h | 8 +- kbabel/catalogmanager/findinfilesdialog.cpp | 4 +- kbabel/catalogmanager/libcvs/cvsdialog.cpp | 58 +++--- kbabel/catalogmanager/libcvs/cvshandler.cpp | 16 +- kbabel/catalogmanager/libcvs/cvshandler.h | 10 +- kbabel/catalogmanager/libcvs/cvsresources.h | 2 +- kbabel/catalogmanager/libsvn/svndialog.cpp | 36 ++-- kbabel/catalogmanager/libsvn/svnhandler.cpp | 26 +-- kbabel/catalogmanager/libsvn/svnhandler.h | 10 +- kbabel/catalogmanager/multiroughtransdlg.cpp | 26 +-- kbabel/catalogmanager/validateprogress.cpp | 2 +- kbabel/catalogmanager/validateprogresswidget.ui | 4 +- kbabel/catalogmanager/validateprogresswidget.ui.h | 2 +- kbabel/catalogmanager/validationoptions.ui | 2 +- kbabel/common/catalog.cpp | 54 ++--- kbabel/common/catalog.h | 20 +- kbabel/common/catalogfileplugin.h | 8 +- kbabel/common/catalogitem.cpp | 4 +- kbabel/common/catalogsettings.cpp | 2 +- kbabel/common/importplugin.cpp | 4 +- kbabel/common/kbmailer.cpp | 6 +- kbabel/common/msgfmt.cpp | 10 +- kbabel/common/msgfmt.h | 6 +- kbabel/common/poinfo.cpp | 18 +- kbabel/common/poinfo.h | 6 +- kbabel/commonui/cmdedit.cpp | 38 ++-- kbabel/commonui/context.cpp | 2 +- kbabel/commonui/diffpreferences.ui | 4 +- kbabel/commonui/finddialog.cpp | 20 +- kbabel/commonui/kactionselector.cpp | 2 +- kbabel/commonui/klisteditor.ui | 4 +- kbabel/commonui/projectpref.cpp | 2 +- kbabel/commonui/projectprefwidgets.cpp | 186 ++++++++--------- kbabel/commonui/projectwizard.cpp | 2 +- kbabel/commonui/projectwizardwidget.ui | 2 +- kbabel/commonui/projectwizardwidget2.ui | 6 +- kbabel/commonui/roughtransdlg.cpp | 24 +-- kbabel/datatools/regexp/main.cc | 2 +- kbabel/filters/gettext/gettextexport.cpp | 10 +- kbabel/filters/gettext/gettextexport.h | 2 +- kbabel/filters/gettext/gettextimport.cpp | 28 +-- kbabel/filters/gettext/gettextimport.h | 6 +- kbabel/filters/linguist/linguistexport.cpp | 4 +- kbabel/filters/linguist/linguistexport.h | 2 +- kbabel/filters/linguist/linguistimport.cpp | 2 +- kbabel/filters/linguist/linguistimport.h | 2 +- kbabel/filters/xliff/xliffexport.cpp | 4 +- kbabel/filters/xliff/xliffexport.h | 2 +- kbabel/filters/xliff/xliffimport.cpp | 2 +- kbabel/filters/xliff/xliffimport.h | 2 +- kbabel/kbabel/charselectview.cpp | 12 +- kbabel/kbabel/colorpreferences.ui | 2 +- kbabel/kbabel/commentview.cpp | 12 +- kbabel/kbabel/contextview.cpp | 12 +- kbabel/kbabel/editordiffpreferences.ui | 4 +- kbabel/kbabel/editorpreferences.ui | 10 +- kbabel/kbabel/errorlistview.cpp | 12 +- kbabel/kbabel/headereditor.cpp | 2 +- kbabel/kbabel/hidingmsgedit.cpp | 4 +- kbabel/kbabel/kbabel.cpp | 38 ++-- kbabel/kbabel/kbabelsplash.cpp | 4 +- kbabel/kbabel/kbabelview.cpp | 154 +++++++------- kbabel/kbabel/kbabelview.h | 4 +- kbabel/kbabel/kbabelview2.cpp | 24 +-- kbabel/kbabel/kbbookmarkhandler.cpp | 2 +- kbabel/kbabel/kbcataloglistview.cpp | 8 +- kbabel/kbabel/kbcataloglistviewitem.cpp | 6 +- kbabel/kbabel/kbhighlighting.cpp | 4 +- kbabel/kbabel/main.cpp | 18 +- kbabel/kbabel/mymultilineedit.cpp | 22 +- kbabel/kbabel/mymultilineedit.h | 2 +- kbabel/kbabel/searchpreferences.ui | 4 +- kbabel/kbabel/sourceview.cpp | 8 +- kbabel/kbabel/taglistview.cpp | 8 +- kbabel/kbabeldict/dictchooser.cpp | 18 +- kbabel/kbabeldict/dictionarymenu.cpp | 4 +- kbabel/kbabeldict/kbabeldictbox.cpp | 24 +-- kbabel/kbabeldict/kbabeldictview.cpp | 2 +- kbabel/kbabeldict/kbabelsplash.cpp | 4 +- .../modules/dbsearchengine/KDBSearchEngine.cpp | 12 +- .../kbabeldict/modules/dbsearchengine/database.cpp | 12 +- .../kbabeldict/modules/dbsearchengine/dbscan.cpp | 8 +- .../modules/dbsearchengine/dbseprefwidget.ui | 14 +- .../modules/dbsearchengine/preferenceswidget.cpp | 14 +- .../kbabeldict/modules/dbsearchengine2/dbscan.cpp | 4 +- kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui | 10 +- .../modules/dbsearchengine2/dbseprefwidget.ui | 14 +- .../modules/dbsearchengine2/preferenceswidget.cpp | 8 +- .../modules/dbsearchengine2/sourcedialog.ui | 4 +- .../kbabeldict/modules/poauxiliary/poauxiliary.cpp | 14 +- .../modules/poauxiliary/preferenceswidget.cpp | 6 +- kbabel/kbabeldict/modules/poauxiliary/pwidget.ui | 6 +- .../modules/pocompendium/compendiumdata.cpp | 6 +- .../modules/pocompendium/pocompendium.cpp | 6 +- .../modules/pocompendium/preferenceswidget.cpp | 6 +- kbabel/kbabeldict/modules/pocompendium/pwidget.ui | 6 +- .../kbabeldict/modules/tmx/preferenceswidget.cpp | 6 +- kbabel/kbabeldict/modules/tmx/pwidget.ui | 2 +- kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp | 6 +- .../kbabeldict/modules/tmx/tmxcompendiumdata.cpp | 4 +- kbabel/kbabeldict/searchengine.h | 12 +- kbugbuster/backend/bug.cpp | 36 ++-- kbugbuster/backend/bug.h | 16 +- kbugbuster/backend/bugcache.cpp | 2 +- kbugbuster/backend/bugcommand.h | 20 +- kbugbuster/backend/bugdetails.cpp | 4 +- kbugbuster/backend/bugdetailsjob.cpp | 4 +- kbugbuster/backend/bugimpl.h | 4 +- kbugbuster/backend/buglistjob.cpp | 4 +- kbugbuster/backend/bugmybugsjob.cpp | 2 +- kbugbuster/backend/bugserver.cpp | 6 +- kbugbuster/backend/bugserver.h | 2 +- kbugbuster/backend/domprocessor.cpp | 8 +- kbugbuster/backend/htmlparser.cpp | 2 +- kbugbuster/backend/mailsender.cpp | 36 ++-- kbugbuster/backend/person.cpp | 4 +- kbugbuster/backend/processor.cpp | 2 +- kbugbuster/backend/rdfprocessor.cpp | 4 +- kbugbuster/backend/smtp.cpp | 6 +- kbugbuster/gui/buglvi.cpp | 2 +- kbugbuster/gui/centralwidget.cpp | 8 +- kbugbuster/gui/cwbugdetails.cpp | 46 ++--- kbugbuster/gui/cwbugdetailscontainer.cpp | 22 +- kbugbuster/gui/cwbugdetailscontainer_base.ui | 2 +- kbugbuster/gui/cwbuglistcontainer.cpp | 18 +- kbugbuster/gui/cwloadingwidget.cpp | 2 +- kbugbuster/gui/cwloadingwidget.h | 2 +- kbugbuster/gui/cwsearchwidget.cpp | 2 +- kbugbuster/gui/kbbbookmarkmanager.h | 2 +- kbugbuster/gui/kbbmainwindow.cpp | 4 +- kbugbuster/gui/kbbmainwindow.h | 2 +- kbugbuster/gui/loadallbugsdlg.cpp | 4 +- kbugbuster/gui/messageeditor.cpp | 4 +- kbugbuster/gui/msginputdialog.cpp | 12 +- kbugbuster/gui/packageselectdialog.cpp | 2 +- kbugbuster/gui/preferencesdialog.cpp | 28 +-- kbugbuster/gui/serverconfigdialog.cpp | 2 +- kbugbuster/gui/severityselectdialog.cpp | 2 +- kbugbuster/kresources/kcalresource.cpp | 2 +- kbugbuster/kresources/kcalresourceconfig.cpp | 2 +- kcachegrind/converters/hotshot2calltree | 6 +- kcachegrind/converters/memprof2calltree | 4 +- kcachegrind/kcachegrind/cachegrindloader.cpp | 14 +- kcachegrind/kcachegrind/callgraphview.cpp | 104 +++++----- kcachegrind/kcachegrind/callgraphview.h | 6 +- kcachegrind/kcachegrind/callitem.cpp | 4 +- kcachegrind/kcachegrind/callmapview.cpp | 38 ++-- kcachegrind/kcachegrind/callmapview.h | 6 +- kcachegrind/kcachegrind/callview.cpp | 4 +- kcachegrind/kcachegrind/configdlg.cpp | 2 +- kcachegrind/kcachegrind/configdlgbase.ui | 28 +-- 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/dumpselectionbase.ui | 20 +- kcachegrind/kcachegrind/functionitem.cpp | 8 +- kcachegrind/kcachegrind/functionselection.cpp | 14 +- kcachegrind/kcachegrind/functionselectionbase.ui | 4 +- kcachegrind/kcachegrind/instritem.cpp | 34 +-- kcachegrind/kcachegrind/instritem.h | 2 +- kcachegrind/kcachegrind/instrview.cpp | 10 +- kcachegrind/kcachegrind/loader.h | 2 +- kcachegrind/kcachegrind/multiview.cpp | 6 +- kcachegrind/kcachegrind/partgraph.cpp | 34 +-- kcachegrind/kcachegrind/partgraph.h | 6 +- kcachegrind/kcachegrind/partlistitem.cpp | 6 +- kcachegrind/kcachegrind/partselection.cpp | 10 +- kcachegrind/kcachegrind/partselectionbase.ui | 2 +- kcachegrind/kcachegrind/partview.cpp | 4 +- kcachegrind/kcachegrind/sourceitem.cpp | 30 +-- kcachegrind/kcachegrind/sourceitem.h | 2 +- kcachegrind/kcachegrind/sourceview.cpp | 16 +- kcachegrind/kcachegrind/stackitem.cpp | 4 +- kcachegrind/kcachegrind/tabview.cpp | 16 +- kcachegrind/kcachegrind/tabview.h | 2 +- kcachegrind/kcachegrind/toplevel.cpp | 84 ++++---- kcachegrind/kcachegrind/toplevel.h | 2 +- kcachegrind/kcachegrind/tracedata.cpp | 228 ++++++++++----------- kcachegrind/kcachegrind/tracedata.h | 12 +- kcachegrind/kcachegrind/traceitemview.cpp | 2 +- kcachegrind/kcachegrind/treemap.cpp | 174 ++++++++-------- kcachegrind/kcachegrind/treemap.h | 28 +-- kcachegrind/kcachegrind/utils.h | 2 +- kioslave/svn/ksvnd/commitdlg.ui | 6 +- kioslave/svn/ksvnd/ksvnd.cpp | 32 +-- kioslave/svn/ksvnd/ksvnd.h | 6 +- kioslave/svn/svn.cpp | 58 +++--- kioslave/svn/svnhelper/kio_svn_helper.cpp | 8 +- kioslave/svn/svnhelper/subversioncheckout.ui | 8 +- kioslave/svn/svnhelper/subversiondiff.ui | 2 +- kioslave/svn/svnhelper/subversionlog.ui | 2 +- kioslave/svn/svnhelper/subversionswitch.ui | 8 +- kmtrace/demangle.cpp | 2 +- kmtrace/kmtrace.cpp | 2 +- kmtrace/match.cpp | 6 +- kompare/kompare_shell.cpp | 8 +- kompare/komparenavtreepart/komparenavtreepart.cpp | 2 +- kompare/komparepart/kompare_part.cpp | 32 +-- kompare/komparepart/kompareconnectwidget.cpp | 24 +-- kompare/komparepart/kompareconnectwidget.h | 2 +- kompare/komparepart/komparelistview.cpp | 14 +- kompare/komparepart/komparelistview.h | 4 +- kompare/komparepart/komparesaveoptionsbase.ui | 2 +- kompare/komparepart/komparesplitter.cpp | 24 +-- kompare/libdialogpages/diffpage.cpp | 50 ++--- kompare/libdialogpages/filespage.cpp | 16 +- kompare/libdialogpages/pagebase.cpp | 14 +- kompare/libdialogpages/viewpage.cpp | 50 ++--- kompare/libdiff2/difference.h | 2 +- kompare/libdiff2/diffhunk.cpp | 12 +- kompare/libdiff2/diffmodel.cpp | 8 +- kompare/libdiff2/komparemodellist.cpp | 14 +- kompare/libdiff2/kompareprocess.cpp | 2 +- kompare/libdiff2/levenshteintable.cpp | 4 +- kompare/libdiff2/perforceparser.cpp | 18 +- kompare/tests/cvsdiff/context.diff | 4 +- kompare/tests/cvsdiff/contextm.diff | 8 +- kompare/tests/cvsdiff/unified.diff | 2 +- kompare/tests/cvsdiff/unifiedm.diff | 4 +- kompare/tests/diff/contextm.diff | 8 +- kompare/tests/diff/unifiedm.diff | 4 +- kspy/classinfoview.cpp | 2 +- kspy/propsview.cpp | 46 ++--- kspy/receiversview.cpp | 10 +- kspy/receiversview.h | 2 +- kspy/sigslotview.cpp | 2 +- kspy/spy.cpp | 8 +- kstartperf/kstartperf.cpp | 2 +- kuiviewer/kuiviewer.cpp | 4 +- kuiviewer/kuiviewer_part.cpp | 4 +- kunittest/runnergui.cpp | 16 +- kunittest/testerwidget.ui | 4 +- 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/lauri.po | 2 +- poxml/lauri.xml | 4 +- poxml/parser.cpp | 54 ++--- poxml/split.cpp | 2 +- poxml/transxx.cpp | 2 +- poxml/xml2pot.cpp | 2 +- scheck/scheck.cpp | 142 ++++++------- scheck/scheck.h | 10 +- scripts/fixheaders | 2 +- scripts/kde-devel-emacs.el | 2 +- scripts/kde-devel-gdb | 4 +- scripts/kde-devel-vim.vim | 2 +- scripts/kde-emacs/kde-emacs-core.el | 2 +- scripts/kde-emacs/klaralv.el | 4 +- scripts/kde-spellcheck.pl | 4 +- scripts/tdesvn-build | 2 +- umbrello/umbrello/aligntoolbar.cpp | 4 +- umbrello/umbrello/aligntoolbar.h | 8 +- umbrello/umbrello/associationwidget.cpp | 4 +- umbrello/umbrello/associationwidget.h | 2 +- umbrello/umbrello/autolayout/_graph.h | 2 +- umbrello/umbrello/autolayout/autolayoutdlg.cpp | 30 +-- umbrello/umbrello/autolayout/autolayoutdlg.h | 8 +- umbrello/umbrello/autolayout/autolayouter.cpp | 6 +- umbrello/umbrello/autolayout/autolayouter.h | 14 +- .../umbrello/autolayout/autolayouteradapter.cpp | 42 ++-- umbrello/umbrello/autolayout/autolayouteradapter.h | 8 +- umbrello/umbrello/autolayout/canvas.h | 2 +- umbrello/umbrello/autolayout/diagram.h | 6 +- umbrello/umbrello/autolayout/dotautolayouter.cpp | 8 +- umbrello/umbrello/autolayout/dotautolayouter.h | 4 +- .../umbrello/autolayout/graphvizautolayouter.cpp | 6 +- .../umbrello/autolayout/graphvizautolayouter.h | 4 +- umbrello/umbrello/autolayout/graphvizgraph.cpp | 24 +-- umbrello/umbrello/autolayout/graphvizgraph.h | 4 +- umbrello/umbrello/autolayout/graphviznode.cpp | 4 +- umbrello/umbrello/autolayout/graphviznode.h | 4 +- .../umbrello/autolayout/newautolayoutdialog.ui | 22 +- umbrello/umbrello/autolayout/node.h | 2 +- umbrello/umbrello/autolayout/simplecanvas.cpp | 2 +- umbrello/umbrello/autolayout/simplecanvas.h | 2 +- umbrello/umbrello/classifierwidget.h | 4 +- umbrello/umbrello/clipboard/umlclipboard.cpp | 6 +- umbrello/umbrello/clipboard/umlclipboard.h | 6 +- umbrello/umbrello/clipboard/umldrag.cpp | 18 +- umbrello/umbrello/clipboard/umldrag.h | 2 +- umbrello/umbrello/codedocument.cpp | 2 +- umbrello/umbrello/codegenerationpolicy.cpp | 4 +- umbrello/umbrello/codegenerator.cpp | 4 +- umbrello/umbrello/codegenerators/adawriter.cpp | 2 +- umbrello/umbrello/codegenerators/aswriter.cpp | 2 +- .../codegenerators/cppcodegenerationformbase.ui | 14 +- umbrello/umbrello/codegenerators/cppwriter.cpp | 4 +- umbrello/umbrello/codegenerators/csharpwriter.cpp | 4 +- umbrello/umbrello/codegenerators/dwriter.cpp | 2 +- umbrello/umbrello/codegenerators/idlwriter.cpp | 2 +- .../codegenerators/javaclassifiercodedocument.cpp | 2 +- .../codegenerators/javacodegenerationformbase.ui | 8 +- umbrello/umbrello/codegenerators/javawriter.cpp | 4 +- umbrello/umbrello/codegenerators/jswriter.cpp | 2 +- umbrello/umbrello/codegenerators/pascalwriter.cpp | 2 +- umbrello/umbrello/codegenerators/perlwriter.cpp | 6 +- umbrello/umbrello/codegenerators/php5writer.cpp | 32 +-- umbrello/umbrello/codegenerators/phpwriter.cpp | 32 +-- umbrello/umbrello/codegenerators/pythonwriter.cpp | 4 +- .../codegenerators/rubyclassifiercodedocument.cpp | 2 +- .../codegenerators/rubycodegenerationformbase.ui | 8 +- umbrello/umbrello/codegenerators/rubywriter.cpp | 2 +- umbrello/umbrello/codegenerators/sqlwriter.cpp | 2 +- umbrello/umbrello/codegenerators/tclwriter.cpp | 2 +- .../umbrello/codegenerators/xmlschemawriter.cpp | 4 +- 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/javaimport.cpp | 2 +- umbrello/umbrello/codeimport/kdevcppparser/ast.cpp | 8 +- umbrello/umbrello/codeimport/kdevcppparser/ast.h | 4 +- .../codeimport/kdevcppparser/ast_utils.cpp | 10 +- .../umbrello/codeimport/kdevcppparser/lexer.cpp | 14 +- .../umbrello/codeimport/kdevcppparser/lookup.cpp | 6 +- .../umbrello/codeimport/kdevcppparser/parser.cpp | 6 +- .../umbrello/codeimport/kdevcppparser/urlutil.cpp | 2 +- umbrello/umbrello/codeimport/nativeimportbase.cpp | 2 +- umbrello/umbrello/dialog_utils.cpp | 8 +- umbrello/umbrello/dialog_utils.h | 4 +- umbrello/umbrello/dialogs/activitydialog.cpp | 2 +- umbrello/umbrello/dialogs/activitypage.cpp | 4 +- umbrello/umbrello/dialogs/assocgenpage.cpp | 2 +- umbrello/umbrello/dialogs/assocpage.cpp | 10 +- umbrello/umbrello/dialogs/assocpropdlg.cpp | 2 +- umbrello/umbrello/dialogs/assocrolepage.cpp | 4 +- umbrello/umbrello/dialogs/classgenpage.cpp | 2 +- umbrello/umbrello/dialogs/classifierlistpage.cpp | 6 +- umbrello/umbrello/dialogs/classifierlistpage.h | 2 +- umbrello/umbrello/dialogs/classoptionspage.cpp | 2 +- umbrello/umbrello/dialogs/classoptionspage.h | 2 +- umbrello/umbrello/dialogs/classpropdlg.cpp | 2 +- umbrello/umbrello/dialogs/codeeditor.cpp | 4 +- umbrello/umbrello/dialogs/codeeditor.h | 2 +- .../umbrello/dialogs/codegenerationoptionsbase.ui | 14 +- umbrello/umbrello/dialogs/codegenerationwizard.cpp | 4 +- .../umbrello/dialogs/codegenerationwizardbase.ui | 12 +- umbrello/umbrello/dialogs/codeviewerdialog.cpp | 4 +- umbrello/umbrello/dialogs/codeviewerdialog.h | 2 +- umbrello/umbrello/dialogs/codeviewerdialogbase.ui | 2 +- umbrello/umbrello/dialogs/codevieweroptionsbase.ui | 6 +- umbrello/umbrello/dialogs/diagramprintpage.cpp | 8 +- umbrello/umbrello/dialogs/diagrampropertiespage.ui | 20 +- umbrello/umbrello/dialogs/exportallviewsdialog.cpp | 4 +- .../umbrello/dialogs/exportallviewsdialogbase.ui | 4 +- umbrello/umbrello/dialogs/notedialog.cpp | 4 +- umbrello/umbrello/dialogs/overwritedialogue.cpp | 10 +- umbrello/umbrello/dialogs/parmpropdlg.cpp | 2 +- umbrello/umbrello/dialogs/parmpropdlg.h | 2 +- umbrello/umbrello/dialogs/pkgcontentspage.cpp | 10 +- umbrello/umbrello/dialogs/selectopdlg.cpp | 2 +- umbrello/umbrello/dialogs/settingsdlg.cpp | 2 +- umbrello/umbrello/dialogs/statedialog.cpp | 2 +- umbrello/umbrello/dialogs/umlattributedialog.cpp | 2 +- .../umbrello/dialogs/umlentityattributedialog.cpp | 2 +- umbrello/umbrello/dialogs/umloperationdialog.cpp | 4 +- umbrello/umbrello/dialogs/umlroledialog.cpp | 4 +- umbrello/umbrello/dialogs/umlroleproperties.cpp | 2 +- umbrello/umbrello/dialogs/umlrolepropertiesbase.ui | 6 +- umbrello/umbrello/dialogs/umltemplatedialog.cpp | 2 +- umbrello/umbrello/dialogs/umlviewdialog.cpp | 4 +- umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp | 2 +- .../umbrello/docgenerators/docbookgenerator.cpp | 4 +- umbrello/umbrello/docgenerators/xhtmlgenerator.cpp | 2 +- umbrello/umbrello/docwindow.cpp | 2 +- umbrello/umbrello/floatingtextwidget.cpp | 8 +- umbrello/umbrello/folder.cpp | 4 +- umbrello/umbrello/import_rose.cpp | 2 +- umbrello/umbrello/kplayerslideraction.cpp | 10 +- umbrello/umbrello/kplayerslideraction.h | 4 +- umbrello/umbrello/linepath.cpp | 14 +- umbrello/umbrello/messagewidget.cpp | 6 +- umbrello/umbrello/messagewidget.h | 2 +- umbrello/umbrello/model_utils.cpp | 10 +- umbrello/umbrello/model_utils.h | 12 +- umbrello/umbrello/notewidget.cpp | 4 +- umbrello/umbrello/notewidgetcontroller.h | 2 +- .../umbrello/refactoring/refactoringassistant.cpp | 4 +- umbrello/umbrello/seqlinewidget.cpp | 6 +- umbrello/umbrello/toolbarstatearrow.cpp | 2 +- umbrello/umbrello/toolbarstateassociation.cpp | 2 +- umbrello/umbrello/toolbarstatemessages.cpp | 2 +- umbrello/umbrello/uml.cpp | 28 +-- umbrello/umbrello/uml.h | 6 +- umbrello/umbrello/umldoc.cpp | 36 ++-- umbrello/umbrello/umllistview.cpp | 14 +- umbrello/umbrello/umllistview.h | 2 +- umbrello/umbrello/umllistviewitem.cpp | 8 +- umbrello/umbrello/umllistviewitem.h | 4 +- umbrello/umbrello/umlobject.h | 2 +- umbrello/umbrello/umlview.cpp | 26 +-- umbrello/umbrello/umlview.h | 6 +- umbrello/umbrello/umlviewimageexporter.cpp | 2 +- umbrello/umbrello/umlviewimageexportermodel.cpp | 10 +- umbrello/umbrello/umlwidget.h | 4 +- umbrello/umbrello/widget_utils.cpp | 4 +- 467 files changed, 2671 insertions(+), 2671 deletions(-) diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index a099397e..73c41d12 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -40,18 +40,18 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); TQLabel *textlabel = new TQLabel ( (action==Add)? i18n("Add the following files to the repository:") : (action==AddBinary)? i18n("Add the following binary files to the repository:") : i18n("Remove the following files from the repository:") , mainWidget ); - layout->addWidget(textlabel); + tqlayout->addWidget(textlabel); m_listBox = new TQListBox(mainWidget); m_listBox->setSelectionMode(TQListBox::NoSelection); - layout->addWidget(m_listBox, 5); + tqlayout->addWidget(m_listBox, 5); // Add warning message to dialog when user wants to remove a file if (action==Remove) @@ -69,9 +69,9 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char "your local working copy."), mainWidget); warningLayout->addWidget(warningText); - layout->addSpacing(5); - layout->addLayout(warningLayout); - layout->addSpacing(5); + tqlayout->addSpacing(5); + tqlayout->addLayout(warningLayout); + tqlayout->addSpacing(5); } if( action == Remove ) diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp index 187e0e16..e451fca0 100644 --- a/cervisia/addrepositorydlg.cpp +++ b/cervisia/addrepositorydlg.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -40,10 +40,10 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, { TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget); - layout->addWidget(repo_label); + tqlayout->addWidget(repo_label); repo_edit = new KLineEdit(mainWidget); repo_edit->setFocus(); @@ -53,33 +53,33 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, repo_edit->setText(repo); repo_edit->setEnabled(false); } - layout->addWidget(repo_edit); + tqlayout->addWidget(repo_edit); TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget); - layout->addWidget(rsh_label); + tqlayout->addWidget(rsh_label); rsh_edit = new KLineEdit(mainWidget); rsh_label->setBuddy(rsh_edit); - layout->addWidget(rsh_edit); + tqlayout->addWidget(rsh_edit); TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"), mainWidget); - layout->addWidget(server_label); + tqlayout->addWidget(server_label); server_edit = new KLineEdit(mainWidget); server_label->setBuddy(server_edit); - layout->addWidget(server_edit); + tqlayout->addWidget(server_edit); TQHBox* compressionBox = new TQHBox(mainWidget); m_useDifferentCompression = new TQCheckBox(i18n("Use different &compression level:"), compressionBox); m_compressionLevel = new KIntNumInput(compressionBox); m_compressionLevel->setRange(0, 9, 1, false); - layout->addWidget(compressionBox); + tqlayout->addWidget(compressionBox); m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from " "server"), mainWidget); - layout->addWidget(m_retrieveCvsignoreFile); + tqlayout->addWidget(m_retrieveCvsignoreFile); connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(repoChanged()) ); diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp index 1f220342..09d0cef0 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").arg(fileName)); + d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName)); d->dialog->show(); } diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp index 6d99c573..f3d80605 100644 --- a/cervisia/annotateview.cpp +++ b/cervisia/annotateview.cpp @@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content, } -TQSize AnnotateView::sizeHint() const +TQSize AnnotateView::tqsizeHint() const { TQFontMetrics fm(fontMetrics()); return TQSize(100 * fm.width("0"), 10 * fm.lineSpacing()); @@ -191,7 +191,7 @@ void AnnotateView::slotQueryToolTip(const TQPoint& viewportPos, const int column(header()->sectionAt(viewportPos.x())); if ((column == AnnotateViewItem::AuthorColumn) && !item->m_logInfo.m_author.isNull()) { - viewportRect = itemRect(item); + viewportRect = tqitemRect(item); text = item->m_logInfo.createToolTipText(false); } } diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h index aa6d947b..e4c78b58 100644 --- a/cervisia/annotateview.h +++ b/cervisia/annotateview.h @@ -46,7 +46,7 @@ public: void addLine(const Cervisia::LogInfo& logInfo, const TQString& content, bool odd); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private slots: diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in index b60c2f3c..3a0c720a 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\-\-geometry\fR\ \fIgeometry\fR\ ] + [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\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\-\-geometry\fR \fIgeometry\fR" 4 -.IX Item "--geometry geometry" -Sets the geometry of the main window +.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4 +.IX Item "--tqgeometry tqgeometry" +Sets the tqgeometry 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 940ba8e0..75ea6b27 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" ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ) ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ) ); text.append( "\n" ); TQString highlightStyle = TQString( "background: %1; color: %2; " ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ); TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( cg.foreground().name() ); TQString borderTopStyle = TQString( "border-top: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( 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 " ) - .arg( submitter ) ); + .tqarg( 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\">" "" ) - .arg( cg.background().name() ) - .arg( cg.foreground().name() ) ); + .tqarg( cg.background().name() ) + .tqarg( 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") - .arg( sender ) ); + .tqarg( sender ) ); else { - text.append( "server()->bugLink( bug ).url() + TQString("#c%1").arg( replies ) + text.append( "server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies ) + "\">" + i18n("Reply #%1 from %2") - .arg( replies ).arg( sender ) ); + .tqarg( replies ).tqarg( 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( "") - .arg( i18n( "Attachment List") ) ); + .tqarg( i18n( "Attachment List") ) ); text.append( TQString("") - .arg( i18n("Description") ) - .arg( i18n("Date") ) - .arg( i18n("View") ) - .arg( i18n("Edit") ) ); + .tqarg( i18n("Description") ) + .tqarg( i18n("Date") ) + .tqarg( i18n("View") ) + .tqarg( i18n("Edit") ) ); TQValueList::iterator it; for ( it = atts.begin() ; it != atts.end() ; ++it ) { - text.append( TQString("").arg( (*it).description ) ) ; - text.append( TQString("").arg( (*it).date ) ); + text.append( TQString("").tqarg( (*it).description ) ) ; + text.append( TQString("").tqarg( (*it).date ) ); text.append( "" ); diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index d6b0ac83..ef8fc8ef 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -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") - .arg( bug.number() ) - .arg( list ) - .arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ) + .tqarg( list ) + .tqarg( bug.severityAsString() ) + .tqarg( bug.title() ); } else { labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3") - .arg( bug.number() ).arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ).tqarg( bug.severityAsString() ) + .tqarg( 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").arg( cmd->name() ); + cmdText += TQString("%1").tqarg( 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)" ) - .arg( bug.number() ).arg( bug.title() ) ); + .tqarg( bug.number() ).tqarg( 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." ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); else msg = i18n( "Retrieving details for bug #%1\n" "(%2)" ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); m_bugLoading->setText( msg ); m_bugStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui index 5f6db167..338a0b7b 100644 --- a/kbugbuster/gui/cwbugdetailscontainer_base.ui +++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui @@ -61,7 +61,7 @@ 0 - + 100 20 diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 778dade1..98124dda 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug } } - m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) ); + m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( 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" ).arg( package.name() ); + listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() ); else - listLabel = i18n( "Product '%1'" ).arg( package.name() ); + listLabel = i18n( "Product '%1'" ).tqarg( package.name() ); } else { - listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component ); + listLabel = i18n( "Product '%1', component '%2'" ).tqarg( 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'..." ).arg( package.name() ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) ); else - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( 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'" ).arg( package.name() ) ); + setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) ); } void CWBugListContainer::setCacheMiss( const TQString &label ) { - m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) ); + m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) ); m_listStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index f2a62573..6e8a9852 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(); - repaint(); + tqrepaint(); } void CWLoadingWidget::updatePixmap() diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h index 744c7951..b0536b09 100644 --- a/kbugbuster/gui/cwloadingwidget.h +++ b/kbugbuster/gui/cwloadingwidget.h @@ -37,7 +37,7 @@ class CWLoadingWidget : public TQFrame public: /** - * Use WidgetMode to specify the layout for the background images + * Use WidgetMode to specify the tqlayout for the background images * TopFrame loads and uses the logo and horizontal bars, * BottomFrame loads the tools and the translucent block. */ diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp index 79c011d7..5a075bb8 100644 --- a/kbugbuster/gui/cwsearchwidget.cpp +++ b/kbugbuster/gui/cwsearchwidget.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h index af58a461..23763300 100644 --- a/kbugbuster/gui/kbbbookmarkmanager.h +++ b/kbugbuster/gui/kbbbookmarkmanager.h @@ -10,7 +10,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("kbugbuster/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 419ba479..3c57c6eb 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -17,11 +17,11 @@ #include "kbbmainwindow.h" #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index a98edc0e..71d621ec 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -120,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KToggleAction *m_disconnectedAction; /** - * Status bar label. We need this, because the default TQt version doesn't + * tqStatus bar label. We need this, because the default TQt version doesn't * support rich text in the messages */ TQLabel *m_statusLabel; diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index d6203c07..72212ccd 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" ).arg( pkg.name() ) ); + setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( 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" ).arg(bug.number()) ); + m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) ); loadNextBug(); } diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index dca6bc2a..54d56ea6 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include @@ -79,7 +79,7 @@ void MessageEditor::addButton() void MessageEditor::removeButton() { int result = KMessageBox::warningContinueCancel(this, - i18n("Remove the button %1?").arg(mSelectionCombo->currentText()), + i18n("Remove the button %1?").tqarg(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 11f05d4f..388a02df 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -2,7 +2,7 @@ // (c) 2001, Cornelius Schumacher #include -#include +#include #include #include @@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, { switch ( mType ) { case Close: - setCaption( i18n("Close Bug %1").arg( mBug.number() ) ); + setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) ); break; case Reply: setCaption( i18n("Reply to Bug") ); @@ -51,23 +51,23 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, if ( mType == Reply ) { TQWidget *r = new TQWidget( w ); - TQHBoxLayout* rlayout = new TQHBoxLayout( r ); + TQHBoxLayout* rtqlayout = new TQHBoxLayout( r ); TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r ); TQFont f = r->font(); f.setBold( true ); r->setFont( f ); - rlayout->add( rlabel ); + rtqlayout->add( rlabel ); mRecipient = new TQComboBox( r ); mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal ); mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly ); mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet ); rlabel->setBuddy( mRecipient ); - rlayout->add( mRecipient ); + rtqlayout->add( mRecipient ); TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding ); - rlayout->addItem( rspacer ); + rtqlayout->addItem( rspacer ); // Reply currently only replies to the bug tracking system r->hide(); diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp index 3b84b9e9..4d3e72ac 100644 --- a/kbugbuster/gui/packageselectdialog.cpp +++ b/kbugbuster/gui/packageselectdialog.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index 6acb3385..2c1a845c 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage() TQFrame *topFrame = addPage( i18n("Servers"), 0, DesktopIcon( "gohome", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); mServerList = new ServerListView( topFrame ); - layout->addWidget( mServerList ); + tqlayout->addWidget( mServerList ); TQHBox *buttonBox = new TQHBox( topFrame ); buttonBox->setSpacing( spacingHint() ); - layout->addWidget( buttonBox ); + tqlayout->addWidget( buttonBox ); TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox ); connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) ); @@ -100,7 +100,7 @@ void PreferencesDialog::setupServerPage() TQPushButton *button = new TQPushButton( i18n("Select Server From List..."), topFrame ); - layout->addWidget( button ); + tqlayout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) ); connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer())); } @@ -110,34 +110,34 @@ void PreferencesDialog::setupAdvancedPage() TQFrame *topFrame = addPage( i18n("Advanced"), 0, DesktopIcon( "misc", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Mail Client" ), topFrame ); - layout->addWidget( mailGroup ); + tqlayout->addWidget( mailGroup ); mKMailButton = new TQRadioButton( i18n( "&KMail" ), mailGroup ); mDirectButton = new TQRadioButton( i18n( "D&irect" ), mailGroup ); mSendmailButton = new TQRadioButton( i18n( "&Sendmail" ), mailGroup ); mShowClosedCheckBox = new TQCheckBox( i18n( "Show closed bugs" ), topFrame ); - layout->addWidget( mShowClosedCheckBox ); + tqlayout->addWidget( mShowClosedCheckBox ); mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame ); - layout->addWidget( mShowWishesCheckBox ); + tqlayout->addWidget( mShowWishesCheckBox ); mShowVotedCheckBox = new TQCheckBox( i18n( "Show bugs with number of votes greater than:" ), topFrame ); - layout->addWidget( mShowVotedCheckBox ); + tqlayout->addWidget( mShowVotedCheckBox ); mMinVotesInput = new KIntNumInput( topFrame ); mMinVotesInput->setMinValue( 0 ); connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)), mMinVotesInput, TQT_SLOT(setEnabled(bool)) ); - layout->addWidget( mMinVotesInput ); + tqlayout->addWidget( mMinVotesInput ); mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame ); - layout->addWidget( mSendBccCheckBox ); + tqlayout->addWidget( mSendBccCheckBox ); } void PreferencesDialog::setDefaults() diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp index 8cf91f5d..feaab83d 100644 --- a/kbugbuster/gui/serverconfigdialog.cpp +++ b/kbugbuster/gui/serverconfigdialog.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp index 66eac388..bef2640b 100644 --- a/kbugbuster/gui/severityselectdialog.cpp +++ b/kbugbuster/gui/severityselectdialog.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index 5af8b8be..dd858f18 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.arg( bug.number() ) ) ); + newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) ); todo = newTodo; } diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp index 2b4a7457..58466642 100644 --- a/kbugbuster/kresources/kcalresourceconfig.cpp +++ b/kbugbuster/kresources/kcalresourceconfig.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kcachegrind/converters/hotshot2calltree b/kcachegrind/converters/hotshot2calltree index 4eb8f7de..e5c886a2 100644 --- a/kcachegrind/converters/hotshot2calltree +++ b/kcachegrind/converters/hotshot2calltree @@ -136,7 +136,7 @@ def return_from_call(caller_stack, call_dict, cost_now): call_dict[called[0]] = per_file_dict -def updateStatus(filecount): +def updatetqStatus(filecount): sys.stdout.write("reading File #%d \r" % filecount) sys.stdout.flush() def convertProfFiles(output, inputfilenames): @@ -153,7 +153,7 @@ def convertProfFiles(output, inputfilenames): filecount = 1 number_of_files = len(inputfilenames) for inputfilename in inputfilenames: - updateStatus(filecount) + updatetqStatus(filecount) cost, filecount = convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount) total_cost += cost if (file_limit > 0) and (filecount > file_limit): @@ -164,7 +164,7 @@ def convertProfFiles(output, inputfilenames): dumpResults(output, call_dict, total_cost, cost_per_pos, cost_per_function) def convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount): - updateStatus(filecount) + updatetqStatus(filecount) if not ((file_limit > 0) and (filecount > file_limit)): if os.path.isdir(inputfilename): cost, filecount = convertProfDir(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount) diff --git a/kcachegrind/converters/memprof2calltree b/kcachegrind/converters/memprof2calltree index e82d6e85..a04eaa38 100755 --- a/kcachegrind/converters/memprof2calltree +++ b/kcachegrind/converters/memprof2calltree @@ -13,8 +13,8 @@ while(<>) { print "\nfn=$1\n"; next; } - if (/^ children:/) { - $next = 1; #children + if (/^ tqchildren:/) { + $next = 1; #tqchildren next; } if (/^ inherited:/) { diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp index 4fe57d34..761830fc 100644 --- a/kcachegrind/kcachegrind/cachegrindloader.cpp +++ b/kcachegrind/kcachegrind/cachegrindloader.cpp @@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p) CachegrindLoader l; /* emit progress signals via the singleton loader */ - connect(&l, TQT_SIGNAL(updateStatus(TQString, int)), - this, TQT_SIGNAL(updateStatus(TQString, int))); + connect(&l, TQT_SIGNAL(updatetqStatus(TQString, int)), + this, TQT_SIGNAL(updatetqStatus(TQString, int))); return l.loadTraceInternal(p); } @@ -735,9 +735,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) return false; } kdDebug() << "Loading " << _filename << " ..." << endl; - TQString statusMsg = i18n("Loading %1").arg(_filename); + TQString statusMsg = i18n("Loading %1").tqarg(_filename); int statusProgress = 0; - emit updateStatus(statusMsg,statusProgress); + emit updatetqStatus(statusMsg,statusProgress); #if USE_FIXCOST @@ -815,7 +815,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) * "long operations" (like file loading) are in progress, * this can temporarly switch to another operation. */ - emit updateStatus(statusMsg,statusProgress); + emit updatetqStatus(statusMsg,statusProgress); } continue; @@ -1308,9 +1308,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) } - emit updateStatus(statusMsg,100); + emit updatetqStatus(statusMsg,100); - _part->invalidate(); + _part->tqinvalidate(); if (!totalsSet) { _part->totals()->clear(); _part->totals()->addCost(_part); diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index f9d06e68..5fc8dbb3 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -303,8 +303,8 @@ GraphEdge::GraphEdge() TQString GraphEdge::prettyName() { if (_c) return _c->prettyName(); - if (_from) return i18n("Call(s) from %1").arg(_from->prettyName()); - if (_to) return i18n("Call(s) to %1").arg(_to->prettyName()); + if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName()); + if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName()); return i18n("(unknown call)"); } @@ -376,7 +376,7 @@ TQString GraphOptions::layoutString(Layout l) return TQString("TopDown"); } -GraphOptions::Layout GraphOptions::layout(TQString s) +GraphOptions::Layout GraphOptions::tqlayout(TQString s) { if (s == TQString("Circular")) return Circular; if (s == TQString("LeftRight")) return LeftRight; @@ -562,10 +562,10 @@ void GraphExporter::writeDot() *stream << "digraph \"callgraph\" {\n"; - if (_go->layout() == LeftRight) { + if (_go->tqlayout() == LeftRight) { *stream << TQString(" rankdir=LR;\n"); } - else if (_go->layout() == Circular) { + else if (_go->tqlayout() == Circular) { TraceFunction *f = 0; switch(_item->type()) { case TraceItem::Function: @@ -579,7 +579,7 @@ void GraphExporter::writeDot() break; } if (f) - *stream << TQString(" center=F%1;\n").arg((long)f, 0, 16); + *stream << TQString(" center=F%1;\n").tqarg((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") - .arg(cluster).arg(iabr); + .tqarg(cluster).tqarg(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 [").arg((long)f, 0, 16); + *stream << TQString(" F%1 [").tqarg((long)f, 0, 16); if (_useBox) { // make label 3 lines for CallGraphView - *stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n") - .arg(abr) - .arg(SubCost(np->incl).pretty()); + *stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n") + .tqarg(abr) + .tqarg(SubCost(np->incl).pretty()); } else *stream << TQString("label=\"%1\\n%2\"];\n") - .arg(abr) - .arg(SubCost(np->incl).pretty()); + .tqarg(abr) + .tqarg(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") - .arg((long)e.from(), 0, 16) - .arg((long)e.to(), 0, 16) - .arg((long)log(log(e.cost))); + .tqarg((long)e.from(), 0, 16) + .tqarg((long)e.to(), 0, 16) + .tqarg((long)log(log(e.cost))); if (_go->detailLevel() ==1) *stream << TQString(",label=\"%1\"") - .arg(SubCost(e.cost).pretty()); + .tqarg(SubCost(e.cost).pretty()); else if (_go->detailLevel() ==2) *stream << TQString(",label=\"%3\\n%4 x\"") - .arg(SubCost(e.cost).pretty()) - .arg(SubCost(e.count).pretty()); + .tqarg(SubCost(e.cost).pretty()) + .tqarg(SubCost(e.count).pretty()); *stream << TQString("];\n"); } @@ -713,14 +713,14 @@ void GraphExporter::writeDot() e->cost = costSum; e->count = countSum; - *stream << TQString(" R%1 [shape=point,label=\"\"];\n") - .arg((long)n.function(), 0, 16); + *stream << TQString(" R%1 [tqshape=point,label=\"\"];\n") + .tqarg((long)n.function(), 0, 16); *stream << TQString(" R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .arg((long)n.function(), 0, 16) - .arg((long)n.function(), 0, 16) - .arg(SubCost(costSum).pretty()) - .arg(SubCost(countSum).pretty()) - .arg((int)log(costSum)); + .tqarg((long)n.function(), 0, 16) + .tqarg((long)n.function(), 0, 16) + .tqarg(SubCost(costSum).pretty()) + .tqarg(SubCost(countSum).pretty()) + .tqarg((int)log(costSum)); } costSum = countSum = 0.0; @@ -736,14 +736,14 @@ void GraphExporter::writeDot() e->cost = costSum; e->count = countSum; - *stream << TQString(" S%1 [shape=point,label=\"\"];\n") - .arg((long)n.function(), 0, 16); + *stream << TQString(" S%1 [tqshape=point,label=\"\"];\n") + .tqarg((long)n.function(), 0, 16); *stream << TQString(" F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .arg((long)n.function(), 0, 16) - .arg((long)n.function(), 0, 16) - .arg(SubCost(costSum).pretty()) - .arg(SubCost(countSum).pretty()) - .arg((int)log(costSum)); + .tqarg((long)n.function(), 0, 16) + .tqarg((long)n.function(), 0, 16) + .tqarg(SubCost(costSum).pretty()) + .tqarg(SubCost(countSum).pretty()) + .tqarg((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 %") - .arg(inclP, 0, 'f', Configuration::percentPrecision())); + .tqarg(inclP, 0, 'f', Configuration::percentPrecision())); else setText(1, SubCost(n->incl).pretty()); setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true)); @@ -1096,7 +1096,7 @@ void CanvasNode::drawShape(TQPainter& p) if (StoredDrawParams::selected() && _view->hasFocus()) { _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, - _view->colorGroup()); + _view->tqcolorGroup()); } // draw afterwards to always get a frame even when zoomed @@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, if (!e) return; setPosition(1, DrawParams::TopCenter); - setText(1, TQString("%1 x").arg(SubCost(e->count).pretty())); + setText(1, TQString("%1 x").tqarg(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 %") - .arg(inclP, 0, 'f', Configuration::percentPrecision())); + .tqarg(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)").arg(cn->text(0)).arg(cn->text(1)); + TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(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)") - .arg(ce->label()->text(0)).arg(ce->label()->text(1)); + .tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1)); tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr); } } @@ -1589,7 +1589,7 @@ void CallGraphView::keyPressEvent(TQKeyEvent* e) TraceFunction* f = 0; TraceCall* c = 0; - // rotate arrow key meaning for LeftRight layout + // rotate arrow key meaning for LeftRight tqlayout int key = e->key(); if (_layout == LeftRight) { switch(key) { @@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType) } if (changeType & dataChanged) { - // invalidate old selection and graph part + // tqinvalidate 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") - .arg(_exporter.nodeCount()) - .arg(_exporter.edgeCount())); + .tqarg(_exporter.nodeCount()) + .tqarg(_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") - .arg(_renderProcess->arguments().join(" ")); + .tqarg(_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.arg(_activeItem->name()), _canvas); + TQCanvasText* t = new TQCanvasText(s.tqarg(_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'") - .arg(Configuration::shortenSymbol(name)), 93); + .tqarg(Configuration::shortenSymbol(name)), 93); if (cycle && (cycle != f)) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").arg(name), 94); + popup.insertItem(i18n("Go to '%1'").tqarg(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'") - .arg(Configuration::shortenSymbol(name)), 95); + .tqarg(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").arg(_maxCallerDepth), 106); + gpopup1.insertItem(i18n("< %1").tqarg(_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").arg(_maxCallingDepth), 116); + gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116); gpopup2.setItemChecked(116,true); break; } @@ -2701,7 +2701,7 @@ void CallGraphView::readViewConfig(KConfig* c, _clusterGroups = g->readBoolEntry("ClusterGroups", DEFAULT_CLUSTERGROUPS); _detailLevel = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL); - _layout = GraphOptions::layout(g->readEntry("Layout", + _layout = GraphOptions::tqlayout(g->readEntry("Layout", layoutString(DEFAULT_LAYOUT))); _zoomPosition = zoomPos(g->readEntry("ZoomPosition", zoomPosString(DEFAULT_ZOOMPOS))); diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h index 4db619db..631c6a30 100644 --- a/kcachegrind/kcachegrind/callgraphview.h +++ b/kcachegrind/kcachegrind/callgraphview.h @@ -167,10 +167,10 @@ class GraphOptions virtual bool expandCycles() = 0; virtual bool clusterGroups() = 0; virtual int detailLevel() = 0; - virtual Layout layout() = 0; + virtual Layout tqlayout() = 0; static TQString layoutString(Layout); - static Layout layout(TQString); + static Layout tqlayout(TQString); }; /* Graph Options Storage */ @@ -188,7 +188,7 @@ class StorableGraphOptions: public GraphOptions virtual bool expandCycles() { return _expandCycles; } virtual bool clusterGroups() { return _clusterGroups; } virtual int detailLevel() { return _detailLevel; } - virtual Layout layout() { return _layout; } + virtual Layout tqlayout() { return _layout; } // setters void setMaxCallerDepth(int d) { _maxCallerDepth = d; } diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp index ebca4903..3a3a7266 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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp index 0e4d5e38..3f363f29 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 children " + "'Best' determinates the split direction for tqchildren " "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 children. Note that " + "drawing before drawing tqchildren. 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)") - .arg(shortCurrentName).arg(i->depth()), 55); + .tqarg(shortCurrentName).tqarg(i->depth()), 55); l1popup.setItemChecked(55, maxDepth == i->depth()); } if (maxDepth>0) { l1popup.insertSeparator(); - l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56); - l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57); + l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56); + l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(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)") - .arg(shortCurrentName).arg(currentArea), 67); + .tqarg(shortCurrentName).tqarg(currentArea), 67); l3popup.setItemChecked(67, mArea == currentArea); } if (mArea>0) { l3popup.insertSeparator(); l3popup.insertItem(i18n("Double Area Limit (to %1)") - .arg(mArea*2), 68); + .tqarg(mArea*2), 68); l3popup.insertItem(i18n("Half Area Limit (to %1)") - .arg(mArea/2), 69); + .tqarg(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'").arg(item->text(0)); + TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0)); if (_topLevel) _topLevel->showMessage(msg, 5000); } @@ -531,7 +531,7 @@ void CallMapView::doUpdate(int changeType) TQColor CallMapView::groupColor(TraceFunction* f) const { if (!f) - return colorGroup().button(); + return tqcolorGroup().button(); return Configuration::functionColor(_groupType, f); } @@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const sum = 100.0 * _f->inclusive()->subCost(ct) / total; return TQString("%1 %") - .arg(sum, 0, 'f', Configuration::percentPrecision()); + .tqarg(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::children() +TreeMapItemList* CallMapBaseItem::tqchildren() { if (_f && !initialized()) { CallMapView* w = (CallMapView*)widget(); @@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } 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 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const } -TreeMapItemList* CallMapCallingItem::children() +TreeMapItemList* CallMapCallingItem::tqchildren() { if (!initialized()) { if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii()); @@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } @@ -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 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const } -TreeMapItemList* CallMapCallerItem::children() +TreeMapItemList* CallMapCallerItem::tqchildren() { if (!initialized()) { //qDebug("Create Caller subitems (%s)", name().ascii()); @@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } TQColor CallMapCallerItem::backColor() const diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h index 860743fe..1ee45258 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* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -99,7 +99,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -118,7 +118,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp index 317d137b..2eb08f68 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'") - .arg(Configuration::shortenSymbol(name)), 93); + .tqarg(Configuration::shortenSymbol(name)), 93); if (cycle) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").arg(name), 94); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 94); } popup.insertSeparator(); diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp index e0b45470..7e56c686 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.") - .arg(TQString::number(c->_maxListCount)), + .tqarg(TQString::number(c->_maxListCount)), TQMessageBox::Ok, 0); c->_maxSymbolCount = dlg.symbolCount->text().toInt(); diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui index dc0ee9ec..9e5c0b59 100644 --- a/kcachegrind/kcachegrind/configdlgbase.ui +++ b/kcachegrind/kcachegrind/configdlgbase.ui @@ -42,7 +42,7 @@ - layout10 + tqlayout10 @@ -108,7 +108,7 @@ Fixed - + 16 20 @@ -186,7 +186,7 @@ Fixed - + 20 16 @@ -203,7 +203,7 @@ Fixed - + 16 20 @@ -228,7 +228,7 @@ classCombo - + 300 32767 @@ -330,7 +330,7 @@ fileCombo - + 300 32767 @@ -352,7 +352,7 @@ 0 - + 300 32767 @@ -381,7 +381,7 @@ - layout8 + tqlayout8 @@ -425,7 +425,7 @@ - layout11 + tqlayout11 @@ -441,7 +441,7 @@ Fixed - + 16 20 @@ -469,7 +469,7 @@ - layout10 + tqlayout10 @@ -493,7 +493,7 @@ Expanding - + 16 49 @@ -520,7 +520,7 @@ Fixed - + 20 16 @@ -570,7 +570,7 @@ Expanding - + 210 0 diff --git a/kcachegrind/kcachegrind/configuration.cpp b/kcachegrind/kcachegrind/configuration.cpp index 02d5c096..66abd563 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").arg(count), + colorConfig.writeEntry( TQString("Name%1").tqarg(count), it.currentKey()); - colorConfig.writeEntry( TQString("Color%1").arg(count), + colorConfig.writeEntry( TQString("Color%1").tqarg(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").arg(count), + sourceConfig.writeEntry( TQString("Object%1").tqarg(count), it2.currentKey()); - sourceConfig.writeEntry( TQString("Dirs%1").arg(count), + sourceConfig.writeEntry( TQString("Dirs%1").tqarg(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").tqarg(i+1), t->name()); // Use localized key TraceItemView::writeConfigEntry(&ctConfig, - TQString("Longname%1").arg(i+1).ascii(), + TQString("Longname%1").tqarg(i+1).ascii(), t->longName(), knownLongName(t->name()).utf8().data() /*, true */ ); TraceItemView::writeConfigEntry(&ctConfig, - TQString("Formula%1").arg(i+1).ascii(), + TQString("Formula%1").tqarg(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").arg(i)); - TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i)); + TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i)); + TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(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").arg(i)); - dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':'); + TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i)); + dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(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").arg(i)); - TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i)); + TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i)); + TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i)); if (l.isEmpty()) l = knownLongName(n); - TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i)); + TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(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").arg(t->name()); + n = TQString("CostType-%1").tqarg(t->name()); return color(n)->color; } diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp index 1e777b05..3129838a 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)").arg(_groupSize); + if (_groupSize>=0) n += TQString(" (%1)").tqarg(_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").arg(pure, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision()); else str = _costItem->prettySubCost(_costType); if (_skipped) { // special handling for skip entries... - setText(0, TQString("< %1").arg(str)); + setText(0, TQString("< %1").tqarg(str)); return; } diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp index dc35cb2b..df5bf35a 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") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp index 3f5417e9..d4087eba 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").arg(i))) + if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i))) break; i++; } // add same new cost type to this mapping and to known types - TQString shortName = i18n("New%1").arg(i); - TQString longName = i18n("New Cost Type %1").arg(i); + TQString shortName = i18n("New%1").tqarg(i); + TQString longName = i18n("New Cost Type %1").tqarg(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 86e6f7ff..dc4a9764 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) { - invalidate(f->data(), Coverage::Rtti); + tqinvalidate(f->data(), Coverage::Rtti); _costType = ct; diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp index 26e5b36e..569359a8 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").arg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - setText(0, TQString("< %1").arg(str)); + setText(0, TQString("< %1").tqarg(str)); return; } @@ -121,9 +121,9 @@ void CallerCoverageItem::update() distString = TQString::number(_distance); else distString = TQString("%1-%2 (%3)") - .arg(_coverage->minDistance()) - .arg(_coverage->maxDistance()) - .arg(_distance); + .tqarg(_coverage->minDistance()) + .tqarg(_coverage->maxDistance()) + .tqarg(_distance); setText(1, distString); } @@ -242,12 +242,12 @@ void CalleeCoverageItem::update() TQString str; if (Configuration::showPercentage()) - str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - str = TQString("< %1").arg(str); + str = TQString("< %1").tqarg(str); setText(0, str); setText(1, str); return; @@ -259,7 +259,7 @@ void CalleeCoverageItem::update() if (Configuration::showPercentage()) { setText(1, TQString("%1") - .arg(_pSelf, 0, 'f', Configuration::percentPrecision())); + .tqarg(_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").arg(_distance).arg(sMed); + med = TQString("%1/%2").tqarg(_distance).tqarg(sMed); distString = TQString("%1-%2 (%3)") - .arg(_coverage->minDistance()) - .arg(_coverage->maxDistance()) - .arg(med); + .tqarg(_coverage->minDistance()) + .tqarg(_coverage->maxDistance()) + .tqarg(med); } setText(2, distString); } diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp index 6657e923..6243d8af 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'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui index b8ad1b0c..0643eed7 100644 --- a/kcachegrind/kcachegrind/dumpselectionbase.ui +++ b/kcachegrind/kcachegrind/dumpselectionbase.ui @@ -477,7 +477,7 @@ - layout3 + tqlayout3 @@ -493,7 +493,7 @@ Expanding - + 21 20 @@ -586,7 +586,7 @@ - layout7 + tqlayout7 @@ -602,7 +602,7 @@ Expanding - + 50 20 @@ -642,7 +642,7 @@ - layout2 + tqlayout2 @@ -868,7 +868,7 @@ - layout4 + tqlayout4 @@ -962,7 +962,7 @@ - layout6 + tqlayout6 @@ -986,7 +986,7 @@ Expanding - + 20 20 @@ -1031,7 +1031,7 @@ - layout6 + tqlayout6 @@ -1055,7 +1055,7 @@ Expanding - + 21 20 diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp index 3b694ddf..9df7e651 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()->repaint(); + viewList()->tqrepaint(); #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").arg(incl, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(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") - .arg(incl, 0, 'f', Configuration::percentPrecision())); + .tqarg(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") - .arg(self, 0, 'f', Configuration::percentPrecision())); + .tqarg(self, 0, 'f', Configuration::percentPrecision())); else setText(1, _function->prettySubCost(_costType)); diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp index c5646dd6..437a17bf 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").arg(f->prettyName()), 93); + popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93); popup.insertSeparator(); } } @@ -417,7 +417,7 @@ void FunctionSelection::refresh() if (!_data || _data->parts().count()==0) { functionList->clear(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); // this clears all other lists functionList->setSelected(functionList->firstChild(), true); @@ -547,9 +547,9 @@ void FunctionSelection::refresh() functionList->clearSelection(); //functionList->setUpdatesEnabled(true); - //functionList->repaint(); + //functionList->tqrepaint(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); return; } } @@ -581,7 +581,7 @@ void FunctionSelection::refresh() groupList->clearSelection(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); } @@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) #if 0 if (total == 0.0) { functionList->setUpdatesEnabled(true); - functionList->repaint(); + functionList->tqrepaint(); return; } #endif @@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) } //functionList->setUpdatesEnabled(true); - //functionList->repaint(); + //functionList->tqrepaint(); // Don't emit signal if cost item was changed programatically if (!_inSetGroup) { diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui index eec019db..3ab3378d 100644 --- a/kcachegrind/kcachegrind/functionselectionbase.ui +++ b/kcachegrind/kcachegrind/functionselectionbase.ui @@ -27,7 +27,7 @@ - layout1 + tqlayout1 @@ -90,7 +90,7 @@ 0 - + 32767 150 diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp index ce5e81bb..81341672 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.arg(_instrCall->call()->calledName()); + TQString callStr = templ.tqarg(_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") - .arg(_instrJump->followedCount().pretty()) - .arg(_instrJump->executedCount().pretty()) - .arg(_instrJump->instrTo()->addr().toString()); + .tqarg(_instrJump->followedCount().pretty()) + .tqarg(_instrJump->executedCount().pretty()) + .tqarg(_instrJump->instrTo()->addr().toString()); else jStr = i18n("Jump %1 times to 0x%2") - .arg(_instrJump->executedCount().pretty()) - .arg(_instrJump->instrTo()->addr().toString()); + .tqarg(_instrJump->executedCount().pretty()) + .tqarg(_instrJump->instrTo()->addr().toString()); setText(6, jStr); @@ -209,7 +209,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -228,7 +228,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(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 alignment ) + int column, int width, int tqalignment ) { 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, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void InstrItem::setJumpArray(const TQMemArray& a) @@ -326,7 +326,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else iv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); @@ -373,7 +373,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->fillRect( marg + 6*i-2, (y1==0) ? y1: y1-2, 8, (y2-y1==height())? y2:y2+2, cg.brush( TQColorGroup::Highlight ) ); - c = lv->colorGroup().highlightedText(); + c = lv->tqcolorGroup().highlightedText(); } #endif p->fillRect( marg + 6*i, y1, 4, y2, c); @@ -388,7 +388,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) if (start >= 0) { #if 0 if (_jump[start] == ((TraceItemView*)_view)->selectedItem()) { - c = lv->colorGroup().highlightedText(); + c = lv->tqcolorGroup().highlightedText(); } #endif c = _jump[start]->isCondJump() ? red : blue; @@ -416,13 +416,13 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->drawConvexPolygon(a); p->setPen(c.light()); - p->drawPolyline(a, 0, 5); + p->tqdrawPolyline(a, 0, 5); p->setPen(c.dark()); - p->drawPolyline(a, 4, 2); + p->tqdrawPolyline(a, 4, 2); p->setPen(c.light()); - p->drawPolyline(a, 5, 2); + p->tqdrawPolyline(a, 5, 2); p->setPen(c.dark()); - p->drawPolyline(a, 6, 2); + p->tqdrawPolyline(a, 6, 2); } // draw inner vertical line for start/stop diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h index 2bbce71f..e521ebe0 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 alignment ); + int column, int width, int tqalignment ); int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index 3df16793..39bd9b0b 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'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } else if (instr) { - popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93); + popup.insertItem(i18n("Go to Address %1").tqarg(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\"") - .arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString()) - .arg(objfile); + .tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString()) + .tqarg(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").arg(objfile)); + new InstrItem(this, this, 3, TQString(" %1").tqarg(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/loader.h b/kcachegrind/kcachegrind/loader.h index f79f13d0..ee374054 100644 --- a/kcachegrind/kcachegrind/loader.h +++ b/kcachegrind/kcachegrind/loader.h @@ -67,7 +67,7 @@ public: TQString description() const { return _description; } signals: - void updateStatus(TQString, int); + void updatetqStatus(TQString, int); private: TQString _name, _description; diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp index 4288e2df..18148927 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").arg(n).ascii()); + TQString("TabView-%1").tqarg(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").arg(prefix).arg(tv->name()), + tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(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").arg(prefix).arg(tv->name()), + tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()), postfix, withOptions); } diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp index a20f53dc..47bda4c9 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()->children(); + TreeMapItemList* l = base()->tqchildren(); 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()->children(); + TreeMapItemList* l = base()->tqchildren(); if (l) for (i=l->first();i;i=l->next()) i->refresh(); @@ -131,7 +131,7 @@ bool PartAreaWidget::isHidden(TracePart* part) const TQColor PartAreaWidget::groupColor(TraceFunction* f) const { if (!f) - return colorGroup().button(); + return tqcolorGroup().button(); return Configuration::functionColor(_groupType, f); } @@ -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").arg(i->text(0)); + itemTip = i18n("Profile Part %1").tqarg(i->text(0)); if (!i->text(1).isEmpty()) itemTip += " (" + i->text(1) + ")"; @@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data) refresh(); } -TreeMapItemList* BasePartItem::children() +TreeMapItemList* BasePartItem::tqchildren() { - if (!_data) return _children; + if (!_data) return _tqchildren; if (!initialized()) { // qDebug("Create Parts (%s)", name().ascii()); @@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::children() addItem(new PartItem(part)); } - return _children; + return _tqchildren; } TQString BasePartItem::text(int textNo) const @@ -234,7 +234,7 @@ TQString BasePartItem::text(int textNo) const TQColor BasePartItem::backColor() const { - return widget()->colorGroup().base(); + return widget()->tqcolorGroup().base(); } double BasePartItem::value() 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 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -324,9 +324,9 @@ double PartItem::sum() const return 0.0; } -TreeMapItemList* PartItem::children() +TreeMapItemList* PartItem::tqchildren() { - if (initialized()) return _children; + if (initialized()) return _tqchildren; TraceCost* c; // qDebug("Create Part subitems (%s)", name().ascii()); @@ -339,7 +339,7 @@ TreeMapItemList* PartItem::children() if (c) addItem(new SubPartItem(c)); } - return _children; + return _tqchildren; } @@ -397,7 +397,7 @@ TreeMapItemList* PartItem::children() break; } - return _children; + return _tqchildren; } @@ -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 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -491,7 +491,7 @@ double SubPartItem::sum() const return 0.0; } -TreeMapItemList* SubPartItem::children() +TreeMapItemList* SubPartItem::tqchildren() { if (!initialized()) { // qDebug("Create Part sub-subitems (%s)", name().ascii()); @@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::children() PartAreaWidget* w = (PartAreaWidget*)widget(); if (depth()-2 > w->callLevels()) - return _children; + return _tqchildren; if (w->visualisation() == PartAreaWidget::Inclusive) { TracePartCall* call; @@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::children() } } - return _children; + return _tqchildren; } diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h index f28f12eb..f8ad4ccd 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* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -101,7 +101,7 @@ public: int borderWidth() const { return 0; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -120,7 +120,7 @@ public: SplitMode splitMode() const { return Vertical; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp index 40c2db36..debea16a 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)").arg(part->threadID()); + partName += i18n(" (Thread %1)").tqarg(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") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp index f385e62e..c501702d 100644 --- a/kcachegrind/kcachegrind/partselection.cpp +++ b/kcachegrind/kcachegrind/partselection.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -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'").arg(str); + TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(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()->children(); + TreeMapItemList* list = partAreaWidget->base()->tqchildren(); 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()->children(); + TreeMapItemList l = *partAreaWidget->base()->tqchildren(); // 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()->children(); + TreeMapItemList list = *partAreaWidget->base()->tqchildren(); partAreaWidget->setRangeSelection(list.first(), list.last(), true); } break; diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui index 53320d5b..5ee69746 100644 --- a/kcachegrind/kcachegrind/partselectionbase.ui +++ b/kcachegrind/kcachegrind/partselectionbase.ui @@ -37,7 +37,7 @@ 0 - + 0 50 diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 3f344bbc..853e9928 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'").arg(p->name()), 93); - popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94); + popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93); + popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94); popup.insertSeparator(); } diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp index 305b8244..9556c038 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.arg(_lineCall->call()->calledName()); + TQString callStr = templ.tqarg(_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") - .arg(_lineJump->followedCount().pretty()) - .arg(_lineJump->executedCount().pretty()) - .arg(to); + .tqarg(_lineJump->followedCount().pretty()) + .tqarg(_lineJump->executedCount().pretty()) + .tqarg(to); else jStr = i18n("Jump %1 times to %2") - .arg(_lineJump->executedCount().pretty()) - .arg(to); + .tqarg(_lineJump->executedCount().pretty()) + .tqarg(to); setText(4, jStr); } @@ -193,7 +193,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -212,7 +212,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .arg(pure2, 0, 'f', Configuration::percentPrecision())); + .tqarg(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 alignment ) + int column, int width, int tqalignment ) { 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, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void SourceItem::setJumpArray(const TQMemArray& a) @@ -314,7 +314,7 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else sv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); @@ -391,13 +391,13 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->drawConvexPolygon(a); p->setPen(c.light()); - p->drawPolyline(a, 0, 5); + p->tqdrawPolyline(a, 0, 5); p->setPen(c.dark()); - p->drawPolyline(a, 4, 2); + p->tqdrawPolyline(a, 4, 2); p->setPen(c.light()); - p->drawPolyline(a, 5, 2); + p->tqdrawPolyline(a, 5, 2); p->setPen(c.dark()); - p->drawPolyline(a, 6, 2); + p->tqdrawPolyline(a, 6, 2); } // draw inner vertical line for start/stop diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h index 925e575b..30589835 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 alignment ); + int column, int width, int tqalignment ); 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 dde291ea..64b3e995 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'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } else if (line) { - popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93); + popup.insertItem(i18n("Go to Line %1").tqarg(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'").arg(sf->function()->prettyName())); + TQString(" '%1'").tqarg(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')").arg(filename) : + i18n("Source ('%1')").tqarg(filename) : i18n("Source (unknown)")); } else { new SourceItem(this, this, fileno, 0, true, validSourceFile ? - i18n("--- Inlined from '%1' ---").arg(filename) : + i18n("--- Inlined from '%1' ---").tqarg(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'").arg(sf->function()->prettyName())); + TQString(" '%1'").tqarg(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'") - .arg(sf->function()->object()->prettyName())); + .tqarg(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'").arg(sf->file()->name())); + TQString(" '%1'").tqarg(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 e3763ab4..af0499ba 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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(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") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index d00e1527..52f728b5 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -419,7 +419,7 @@ void TabView::updateVisibility() s.append(100); - // children of mainSplitter + // tqchildren of mainSplitter if (_rightTW->isHidden() != (r == 0)) { if (r == 0) { _rightTW->hide(); @@ -441,7 +441,7 @@ void TabView::updateVisibility() _leftSplitter->show(); } - // children of leftSplitter + // tqchildren of leftSplitter if (_topTW->isHidden() != (t == 0)) { if (t == 0) { _topTW->hide(); @@ -463,7 +463,7 @@ void TabView::updateVisibility() _bottomSplitter->show(); } - // children of bottomSplitter + // tqchildren 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 children + // we set selected item for our own tqchildren select(s); updateView(); @@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c, if (withOptions) v->readViewConfig(c, TQString("%1-%2") - .arg(prefix).arg(v->widget()->name()), + .tqarg(prefix).tqarg(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").arg(prefix) - .arg(v->widget()->name()), postfix, true); + v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix) + .tqarg(v->widget()->name()), postfix, true); } #include "tabview.moc" diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h index b9b40269..221e6e08 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 children of the splitter + * Call checkVisiblity for all TabWidget tqchildren 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 31fce077..44165742 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -100,8 +100,8 @@ TopLevel::TopLevel(const char *name) #if 0 // how to do avoid main window resizing on large statusbar label? TQSizePolicy p(TQSizePolicy::Fixed, TQSizePolicy::Expanding); - _statusLabel->setSizePolicy(p); - _statusbar->setSizePolicy(p); + _statusLabel->tqsetSizePolicy(p); + _statusbar->tqsetSizePolicy(p); #endif _statusbar->addWidget(_statusLabel, 1); @@ -226,21 +226,21 @@ void TopLevel::saveTraceSettings() TQString key = traceKey(); KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); - pConfig.writeEntry(TQString("CostType%1").arg(key), + pConfig.writeEntry(TQString("CostType%1").tqarg(key), _costType ? _costType->name() : TQString("?")); - pConfig.writeEntry(TQString("CostType2%1").arg(key), + pConfig.writeEntry(TQString("CostType2%1").tqarg(key), _costType2 ? _costType2->name() : TQString("?")); - pConfig.writeEntry(TQString("GroupType%1").arg(key), + pConfig.writeEntry(TQString("GroupType%1").tqarg(key), TraceItem::typeName(_groupType)); if (!_data) return; KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); - aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount); - aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent); + aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount); + aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent); saveCurrentState(key); - pConfig.writeEntry(TQString("Group%1").arg(key), + pConfig.writeEntry(TQString("Group%1").tqarg(key), _group ? _group->name() : TQString()); } @@ -452,14 +452,14 @@ void TopLevel::createLayoutActions() TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()), actionCollection(), "layout_duplicate" ); hint = i18n("Duplicate Current Layout" - "

Make a copy of the current layout.

"); + "

Make a copy of the current tqlayout.

"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Remove" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()), actionCollection(), "layout_remove" ); hint = i18n("Remove Current Layout" - "

Delete current layout and make the previous active.

"); + "

Delete current tqlayout and make the previous active.

"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Next" ), @@ -1137,7 +1137,7 @@ void TopLevel::exportGraph() ge.writeDot(); TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&") - .arg(n).arg(n).arg(n); + .tqarg(n).tqarg(n).tqarg(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").arg(key)); - costType = pConfig.readEntry(TQString("CostType%1").arg(key)); - costType2 = pConfig.readEntry(TQString("CostType2%1").arg(key)); + groupType = pConfig.readEntry(TQString("GroupType%1").tqarg(key)); + costType = pConfig.readEntry(TQString("CostType%1").tqarg(key)); + costType2 = pConfig.readEntry(TQString("CostType2%1").tqarg(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").arg(key), 0); - _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0); + _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0); + _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(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").arg(key)); + TQString group = pConfig.readEntry(TQString("Group%1").tqarg(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").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_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").arg(from), + TQString("Layout%1-MainView").tqarg(from), traceKey(), false); _layoutCount--; @@ -1815,13 +1815,13 @@ void TopLevel::layoutNext() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); _layoutCurrent++; if (_layoutCurrent == _layoutCount) _layoutCurrent = 0; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_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").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); _layoutCurrent--; if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_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").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); for(int i=0;i<_layoutCount;i++) { _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), key, false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), TQString(), false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_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").arg(i), + TQString("Layout%1-MainView").tqarg(i), TQString(), false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), key, false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_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").arg(_layoutCount), 1000); + _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000); } @@ -1930,19 +1930,19 @@ void TopLevel::updateStatusBar() } TQString status = TQString("%1 [%2] - ") - .arg(_data->shortTraceName()) - .arg(_data->activePartRange()); + .tqarg(_data->shortTraceName()) + .tqarg(_data->activePartRange()); if (_costType) { status += i18n("Total %1 Cost: %2") - .arg(_costType->longName()) - .arg(_data->prettySubCost(_costType)); + .tqarg(_costType->longName()) + .tqarg(_data->prettySubCost(_costType)); /* this gets too long... if (_costType2 && (_costType2 != _costType)) status += i18n(", %1 Cost: %2") - .arg(_costType2->longName()) - .arg(_data->prettySubCost(_costType2)); + .tqarg(_costType2->longName()) + .tqarg(_data->prettySubCost(_costType2)); */ } else @@ -1952,8 +1952,8 @@ void TopLevel::updateStatusBar() if (_groupType != TraceItem::Function) { status += TQString(" - %1 '%2'") - .arg(TraceItem::i18nTypeName(_groupType)) - .arg(_group ? _group->prettyName() : i18n("(None)")); + .tqarg(TraceItem::i18nTypeName(_groupType)) + .tqarg(_group ? _group->prettyName() : i18n("(None)")); } */ @@ -2048,7 +2048,7 @@ void TopLevel::configChanged() //qDebug("TopLevel::configChanged"); //_showPercentage->setChecked(Configuration::showPercentage()); - // invalidate found/cached dirs of source files + // tqinvalidate found/cached dirs of source files _data->resetSourceDirs(); _partSelection->refresh(); @@ -2340,7 +2340,7 @@ void TopLevel::showMessage(const TQString& msg, int ms) _statusbar->message(msg, ms); } -void TopLevel::showStatus(TQString msg, int progress) +void TopLevel::showtqStatus(TQString msg, int progress) { static bool msgUpdateNeeded = true; diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h index 10e7cde5..c437ceae 100644 --- a/kcachegrind/kcachegrind/toplevel.h +++ b/kcachegrind/kcachegrind/toplevel.h @@ -196,7 +196,7 @@ public slots: void slotShowTip(); // progress in status bar, empty message disables progress display - void showStatus(TQString msg, int progress); + void showtqStatus(TQString msg, int progress); void showMessage(const TQString&, int msec); private: diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index f129c2e5..526c1cb0 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -226,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s) void TraceItem::clear() { - invalidate(); + tqinvalidate(); } @@ -239,8 +239,8 @@ TQString TraceItem::name() const { if (part()) { return i18n("%1 from %2") - .arg(_dep->name()) - .arg(part()->name()); + .tqarg(_dep->name()) + .tqarg(part()->name()); } if (_dep) @@ -259,21 +259,21 @@ TQString TraceItem::prettyName() const TQString TraceItem::fullName() const { return TQString("%1 %2") - .arg(typeName(type())).arg(prettyName()); + .tqarg(typeName(type())).tqarg(prettyName()); } TQString TraceItem::toString() { - return TQString("%1\n [%3]").arg(fullName()).arg(costString(0)); + return TQString("%1\n [%3]").tqarg(fullName()).tqarg(costString(0)); } -void TraceItem::invalidate() +void TraceItem::tqinvalidate() { if (_dirty) return; _dirty = true; if (_dep) - _dep->invalidate(); + _dep->tqinvalidate(); } 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) - invalidate(); + tqinvalidate(); } void TraceCost::set(TraceSubMapping* sm, FixString & s) @@ -391,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s) _cost[i] = 0; _count = maxIndex+1; } - invalidate(); + tqinvalidate(); } @@ -436,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -488,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s) } } - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -544,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s) } } - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -578,14 +578,14 @@ void TraceCost::addCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #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 invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -612,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #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 invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -636,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); } 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) - invalidate(); + tqinvalidate(); } @@ -691,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m) } -void TraceCost::invalidate() +void TraceCost::tqinvalidate() { if (_dirty) return; _dirty = true; _cachedType = 0; // cached value is invalid, too if (_dep) - _dep->invalidate(); + _dep->tqinvalidate(); } void TraceCost::update() @@ -767,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*) if (_dirty) update(); return TQString("%1/%2") - .arg(_followedCount.pretty()) - .arg(_executedCount.pretty()); + .tqarg(_followedCount.pretty()) + .tqarg(_executedCount.pretty()); } void TraceJumpCost::clear() @@ -913,7 +913,7 @@ TQString TraceCostType::parsedFormula() if (!t) continue; if (!t->name().isEmpty()) - res += TQString(" * %1").arg(t->name()); + res += TQString(" * %1").tqarg(t->name()); } return res; @@ -1362,8 +1362,8 @@ TraceCallCost::~TraceCallCost() TQString TraceCallCost::costString(TraceCostMapping* m) { return TQString("%1, Calls %2") - .arg(TraceCost::costString(m)) - .arg(_callCount.pretty()); + .tqarg(TraceCost::costString(m)) + .tqarg(_callCount.pretty()); } TQString TraceCallCost::prettyCallCount() @@ -1388,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c) { _callCount += c; - invalidate(); + tqinvalidate(); } @@ -1404,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost() TQString TraceInclusiveCost::costString(TraceCostMapping* m) { return TQString("%1, Inclusive %2") - .arg(TraceCost::costString(m)) - .arg(_inclusive.costString(m)); + .tqarg(TraceCost::costString(m)) + .tqarg(_inclusive.costString(m)); } void TraceInclusiveCost::clear() @@ -1425,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c) { _inclusive.addCost(c); - invalidate(); + tqinvalidate(); } @@ -1452,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1526,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1600,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1679,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #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") - .arg(_calledContexts).arg(prettyCalledCount()); + .tqarg(_calledContexts).tqarg(prettyCalledCount()); res += TQString(", calling from %1: %2") - .arg(_callingContexts).arg(prettyCallingCount()); + .tqarg(_callingContexts).tqarg(prettyCallingCount()); return res; } @@ -1916,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref) #endif _partInstr.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1937,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref) #endif _partLines.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1958,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref) #endif _partCallers.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added Caller\n %s (now %d)", @@ -1979,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref) #endif _partCallings.append(ref); - invalidate(); + tqinvalidate(); #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") - .arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) - .arg(part()->name()); + .tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) + .tqarg(part()->name()); } //--------------------------------------------------- @@ -2233,8 +2233,8 @@ void TraceInstrJump::update() TQString TraceInstrJump::name() const { return TQString("jump at 0x%1 to 0x%2") - .arg(_instrFrom->addr().toString()) - .arg(_instrTo->addr().toString()); + .tqarg(_instrFrom->addr().toString()) + .tqarg(_instrTo->addr().toString()); } @@ -2316,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part) TQString TraceLineJump::name() const { return TQString("jump at %1 to %2") - .arg(_lineFrom->prettyName()) - .arg(_lineTo->prettyName()); + .tqarg(_lineFrom->prettyName()) + .tqarg(_lineTo->prettyName()); } @@ -2395,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part, TQString TraceInstrCall::name() const { - return TQString("%1 at %2").arg(_call->name()).arg(_instr->name()); + return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name()); } @@ -2431,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part, TQString TraceLineCall::name() const { - return TQString("%1 at %2").arg(_call->name()).arg(_line->name()); + return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name()); } @@ -2478,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i) icall = new TraceInstrCall(this, i); _instrCalls.append(icall); - invalidate(); + tqinvalidate(); #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); - invalidate(); + tqinvalidate(); #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->invalidate(); + lc->tqinvalidate(); TraceInstrCall* ic; for (ic=_instrCalls.first();ic;ic=_instrCalls.next()) - ic->invalidate(); + ic->tqinvalidate(); - invalidate(); + tqinvalidate(); } TQString TraceCall::name() const { return TQString("%1 => %2") - .arg(_caller->name()) - .arg(_called->name()); + .tqarg(_caller->name()) + .tqarg(_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").arg(_caller->prettyName()).arg(via); + return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(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").arg(c->name()).arg(via); + return i18n("%1 via %2").tqarg(c->name()).tqarg(via); } } return _called->prettyName(); @@ -2692,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall) #endif _instrCalls.append(instrCall); - invalidate(); + tqinvalidate(); #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").arg(_addr.toString()); + return TQString("0x%1").tqarg(_addr.toString()); } TQString TraceInstr::prettyName() const { - return TQString("0x%1").arg(_addr.toString()); + return TQString("0x%1").tqarg(_addr.toString()); } @@ -2807,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall) } _lineCalls.append(lineCall); - invalidate(); + tqinvalidate(); #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") - .arg(fileShortName).arg(_lineno); + .tqarg(fileShortName).tqarg(_lineno); } TQString TraceLine::prettyName() const { return TQString("%1 [%2]") - .arg(name()).arg(_sourceFile->function()->prettyName()); + .tqarg(name()).tqarg(_sourceFile->function()->prettyName()); } //--------------------------------------------------- @@ -2869,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource() TQString TraceFunctionSource::name() const { - return TQString("%1 for %2").arg(_file->name()).arg(_function->name()); + return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name()); } uint TraceFunctionSource::firstLineno() @@ -2952,10 +2952,10 @@ void TraceFunctionSource::invalidateDynamicCost() TraceLineMap::Iterator lit; for ( lit = _lineMap->begin(); lit != _lineMap->end(); ++lit ) - (*lit).invalidate(); + (*lit).tqinvalidate(); } - invalidate(); + tqinvalidate(); } TraceLineMap* TraceFunctionSource::lineMap() @@ -3125,7 +3125,7 @@ void TraceAssoziation::clear(TraceData* d, int rtti) (*it).removeAssoziation(rtti); } -void TraceAssoziation::invalidate(TraceData* d, int rtti) +void TraceAssoziation::tqinvalidate(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->invalidate(); + a->tqinvalidate(); } TraceAssoziation* TraceFunction::assoziation(int rtti) @@ -3254,9 +3254,9 @@ TQString TraceFunction::prettyName() const // cycle members if (_cycle) { if (_cycle != this) - res = TQString("%1 ").arg(res).arg(_cycle->cycleNo()); + res = TQString("%1 ").tqarg(res).tqarg(_cycle->cycleNo()); else - res = TQString("").arg(_cycle->cycleNo()); + res = TQString("").tqarg(_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)").arg(to, 0, 16); + loc += TQString(" (0x%1)").tqarg(to, 0, 16); else - loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16); + loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(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)").arg(to); + loc += TQString(" (%1)").tqarg(to); else - loc += TQString(" (%1-%2)").arg(from).arg(to); + loc += TQString(" (%1-%2)").tqarg(from).tqarg(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)").arg(l); + s += TQString(" (%1)").tqarg(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)").arg(prettyName()).arg(l); + return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l); } TQString TraceFunction::info() const { TQString l = location(); if (l.isEmpty()) - return TQString("Function %1").arg(name()); + return TQString("Function %1").tqarg(name()); return TQString("Function %1 (location %2)") - .arg(name()).arg(l); + .tqarg(name()).tqarg(l); } @@ -3414,7 +3414,7 @@ void TraceFunction::addCaller(TraceCall* caller) #endif _callers.append(caller); - invalidate(); + tqinvalidate(); #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 invalidate ourself so invalidations from item propagate up - invalidate(); + // we have to tqinvalidate ourself so invalidations from item propagate up + tqinvalidate(); #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 invalidate ourself so invalidations from item propagate up - invalidate(); + // we have to tqinvalidate ourself so invalidations from item propagate up + tqinvalidate(); #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).invalidate(); + (*iit).tqinvalidate(); } - invalidate(); + tqinvalidate(); } void TraceFunction::update() @@ -3951,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n) _cycle = this; setPosition(f->data()); - setName(TQString("").arg(n)); + setName(TQString("").tqarg(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(); - invalidate(); + tqinvalidate(); } 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->invalidate(); + call->tqinvalidate(); _callings.append(call); // now do some faking... f->setCycle(this); } - invalidate(); + tqinvalidate(); } @@ -4046,7 +4046,7 @@ void TraceClass::addFunction(TraceFunction* function) _functions.append(function); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4093,7 +4093,7 @@ void TraceFile::addFunction(TraceFunction* function) _functions.append(function); - invalidate(); + tqinvalidate(); #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 - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s \n added SourceFile %s (now %d)", @@ -4211,7 +4211,7 @@ void TraceObject::addFunction(TraceFunction* function) _functions.append(function); - invalidate(); + tqinvalidate(); #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").arg(_pid).arg(_number); + TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number); if (data()->maxThreadID()>1) - name += TQString("-%3").arg(_tid); + name += TQString("-%3").tqarg(_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.at(pos) < '0' || (int)str.at(pos) > '9') break; + if ((int)str.tqat(pos) < '0' || (int)str.tqat(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.at(pos) < '0' || (int)str.at(pos) > '9') break; + if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break; t = 10*t + (str[pos++] - '0'); } } @@ -4531,12 +4531,12 @@ void TraceData::load(const TQString& base) updateFunctionCycles(); // clear loading messages from status bar - if (_topLevel) _topLevel->showStatus(TQString(), 0); + if (_topLevel) _topLevel->showtqStatus(TQString(), 0); } TracePart* TraceData::addPart(const TQString& dir, const TQString& name) { - TQString filename = TQString("%1/%2").arg(dir).arg(name); + TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name); #if TRACE_DEBUG qDebug("TraceData::addPart('%s')", filename.ascii()); #endif @@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name) if (!l) return 0; if (_topLevel) - _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)), - TQT_SLOT(showStatus(TQString, int))); + _topLevel->connect(l, TQT_SIGNAL(updatetqStatus(TQString, int)), + TQT_SLOT(showtqStatus(TQString, int))); TracePart* part = new TracePart(this, file); @@ -4632,14 +4632,14 @@ TQString TraceData::activePartRange() else { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").arg(r1).arg(r2); + else res += TQString("%1-%2").tqarg(r1).tqarg(r2); r1 = r2 = count; } } if (r1>=0) { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").arg(r1).arg(r2); + else res += TQString("%1-%2").tqarg(r1).tqarg(r2); } return res; @@ -4647,22 +4647,22 @@ TQString TraceData::activePartRange() void TraceData::invalidateDynamicCost() { - // invalidate all dynamic costs + // tqinvalidate all dynamic costs TraceObjectMap::Iterator oit; for ( oit = _objectMap.begin(); oit != _objectMap.end(); ++oit ) - (*oit).invalidate(); + (*oit).tqinvalidate(); TraceClassMap::Iterator cit; for ( cit = _classMap.begin(); cit != _classMap.end(); ++cit ) - (*cit).invalidate(); + (*cit).tqinvalidate(); TraceFileMap::Iterator fit; for ( fit = _fileMap.begin(); fit != _fileMap.end(); ++fit ) - (*fit).invalidate(); + (*fit).tqinvalidate(); TraceFunctionMap::Iterator it; for ( it = _functionMap.begin(); @@ -4670,7 +4670,7 @@ void TraceData::invalidateDynamicCost() (*it).invalidateDynamicCost(); } - invalidate(); + tqinvalidate(); } @@ -5015,7 +5015,7 @@ void TraceData::updateFunctionCycles() #if 0 int fCount = _functionMap.size(), fNo = 0, progress=0, p; TQString msg = i18n("Recalculating Function Cycles..."); - if (_topLevel) _topLevel->showStatus(msg,0); + if (_topLevel) _topLevel->showtqStatus(msg,0); #endif // DFS and collapse strong connected components (Tarjan) @@ -5029,7 +5029,7 @@ void TraceData::updateFunctionCycles() p = 100*fNo/fCount; if (p> progress) { progress = p; - _topLevel->showStatus(msg, p); + _topLevel->showtqStatus(msg, p); } } #endif @@ -5043,11 +5043,11 @@ void TraceData::updateFunctionCycles() cycle->setup(); _inFunctionCycleUpdate = false; - // we have to invalidate costs because cycles are now taken into account + // we have to tqinvalidate costs because cycles are now taken into account invalidateDynamicCost(); #if 0 - if (0) if (_topLevel) _topLevel->showStatus(TQString(),0); + if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0); #endif } diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h index 8fab2b68..cb97e623 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 invalidate(); + virtual void tqinvalidate(); /** * 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 invalidate(); + virtual void tqinvalidate(); /** 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 invalidate() { _valid = false; } + void tqinvalidate() { _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 invalidate(TraceData* data, int rtti); + static void tqinvalidate(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 invalidate all subcosts of function depending on + // this tqinvalidate 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 - * invalidate the dynamic costs on a activation change, + * tqinvalidate 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 d11f02b6..e2f5ee09 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d) { _newData = d; - // invalidate all pointers to old data + // tqinvalidate 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 797e3a5f..c1f7f12b 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; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TreeMapItem::~TreeMapItem() { - if (_children) delete _children; + if (_tqchildren) delete _tqchildren; if (_freeRects) delete _freeRects; // finally, notify widget about deletion @@ -845,18 +845,18 @@ void TreeMapItem::redraw() void TreeMapItem::clear() { - if (_children) { + if (_tqchildren) { // delete selected items below this item from selection if (_widget) _widget->clearSelection(this); - delete _children; - _children = 0; + delete _tqchildren; + _tqchildren = 0; } } -// invalidates current children and forces redraw -// this is only usefull when children are created on demand in items() +// invalidates current tqchildren and forces redraw +// this is only usefull when tqchildren are created on demand in items() void TreeMapItem::refresh() { clear(); @@ -890,9 +890,9 @@ int TreeMapItem::depth() const bool TreeMapItem::initialized() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); return false; } return true; @@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i) { if (!i) return; - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } i->setParent(this); if (sorting(0) == -1) - _children->append(i); // preserve insertion order + _tqchildren->append(i); // preserve insertion order else - _children->inSort(i); + _tqchildren->inSort(i); } @@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending) _sortAscending = ascending; _sortTextNo = textNo; - if (_children && _sortTextNo != -1) _children->sort(); + if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); } void TreeMapItem::resort(bool recursive) { - if (!_children) return; + if (!_tqchildren) return; - if (_sortTextNo != -1) _children->sort(); + if (_sortTextNo != -1) _tqchildren->sort(); if (recursive) - for (TreeMapItem* i=_children->first(); i; i=_children->next()) + for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) i->resort(recursive); } @@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const return 0; } -TreeMapItemList* TreeMapItem::children() +TreeMapItemList* TreeMapItem::tqchildren() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } - return _children; + return _tqchildren; } void TreeMapItem::clearItemRect() @@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d) TQString TreeMapWidget::defaultFieldType(int f) const { - return i18n("Text %1").arg(f+1); + return i18n("Text %1").tqarg(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->children(); + TreeMapItemList* list = p->tqchildren(); if (!list) i = 0; else { @@ -1517,11 +1517,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << " Checking " << i->path(0).join("/") << " (" - << i->itemRect().x() << "/" << i->itemRect().y() - << "-" << i->itemRect().width() - << "x" << i->itemRect().height() << ")" << endl; + << i->tqitemRect().x() << "/" << i->tqitemRect().y() + << "-" << i->tqitemRect().width() + << "x" << i->tqitemRect().height() << ")" << endl; - if (i->itemRect().contains(x, y)) { + if (i->tqitemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1539,7 +1539,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "): Got " << p->path(0).join("/") << " (Size " - << p->itemRect().width() << "x" << p->itemRect().height() + << p->tqitemRect().width() << "x" << p->tqitemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1568,16 +1568,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->itemRect().width() <1) || - (i->itemRect().height() <1))) { + while(i && ((i->tqitemRect().width() <1) || + (i->tqitemRect().height() <1))) { TreeMapItem* p = i->parent(); if (!p) break; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->findRef(i); idx--; if (idx<0) i = p; else - i = p->children()->at(idx); + i = p->tqchildren()->at(idx); } } return i; @@ -1771,7 +1771,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, i2 = i2->parent(); if (!i2) return changed; - TreeMapItemList* list = commonParent->children(); + TreeMapItemList* list = commonParent->tqchildren(); if (!list) return changed; TreeMapItem* i = list->first(); @@ -1794,11 +1794,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); + TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1962,14 +1962,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) int nextVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; - while (idx < (int)p->children()->count()-1) { + while (idx < (int)p->tqchildren()->count()-1) { idx++; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1980,14 +1980,14 @@ int nextVisible(TreeMapItem* i) int prevVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); 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->children()->at(newIdx), true); + setCurrent(p->tqchildren()->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->children()->at(newIdx), true); + setCurrent(p->tqchildren()->at(newIdx), true); } } else if (e->key() == Key_Down) { - if (_current->children() && _current->children()->count()>0) { + if (_current->tqchildren() && _current->tqchildren()->count()>0) { int newIdx = _current->index(); if (newIdx<0) - newIdx = goBack ? (_current->children()->count()-1) : 0; - if (newIdx>=(int)_current->children()->count()) - newIdx = _current->children()->count()-1; - newItem = visibleItem(_current->children()->at(newIdx)); + newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; + if (newIdx>=(int)_current->tqchildren()->count()) + newIdx = _current->tqchildren()->count()-1; + newItem = visibleItem(_current->tqchildren()->at(newIdx)); setCurrent(newItem, true); } } @@ -2162,7 +2162,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->itemRect().isValid()) return; + if (!_needsRefresh->tqitemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2180,7 +2180,7 @@ void TreeMapWidget::drawTreeMap() TQPainter p(this); tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - colorGroup() ); + tqcolorGroup() ); } } @@ -2226,7 +2226,7 @@ void TreeMapWidget::drawItem(TQPainter* p, int dd = item->depth(); if (isTransparent(dd)) return; - RectDrawing d(item->itemRect()); + RectDrawing d(item->tqitemRect()); item->setSelected(isSelected); item->setCurrent(isCurrent); item->setShaded(_shading); @@ -2261,25 +2261,25 @@ void TreeMapWidget::drawItems(TQPainter* p, { if (DEBUG_DRAWING) kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", " - << item->itemRect().x() << "/" << item->itemRect().y() - << "-" << item->itemRect().width() << "x" - << item->itemRect().height() << "), Val " << item->value() + << item->tqitemRect().x() << "/" << item->tqitemRect().y() + << "-" << item->tqitemRect().width() << "x" + << item->tqitemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->itemRect(); + TQRect origRect = item->tqitemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); - TreeMapItemList* list = item->children(); + TreeMapItemList* list = item->tqchildren(); TreeMapItem* i; bool stopDrawing = false; - // only subdivide if there are children + // only subdivide if there are tqchildren if (!list || list->count()==0) stopDrawing = true; @@ -2312,12 +2312,12 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // invalidate rects + // tqinvalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->itemRect()); + item->addFreeRect(item->tqitemRect()); // if we have space for text... if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; @@ -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 children) for tooltip + // set selfRect (not occupied by tqchildren) 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 children +// fills area with a pattern if to small to draw tqchildren 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 children +// fills area with a pattern if to small to draw tqchildren 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").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->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->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").arg(fieldType(0)), id); + popup->insertItem(i18n("No %1 Limit").tqarg(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)") - .arg(i->text(0)).arg(area), id+1); + .tqarg(i->text(0)).tqarg(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)") - .arg(minimalArea()*2), id+5); + .tqarg(minimalArea()*2), id+5); popup->insertItem(i18n("Halve Area Limit (to %1)") - .arg(minimalArea()/2), id+6); + .tqarg(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)") - .arg(i->text(0)).arg(d), id+1); + .tqarg(i->text(0)).tqarg(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").arg(maxDrawingDepth()), id+10); + popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10); popup->setItemChecked(id+10, true); } popup->insertItem(i18n("Decrement (to %1)") - .arg(maxDrawingDepth()-1), id+2); + .tqarg(maxDrawingDepth()-1), id+2); popup->insertItem(i18n("Increment (to %1)") - .arg(maxDrawingDepth()+1), id+3); + .tqarg(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").arg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f), _attr[f].visible); - config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), _attr[f].forced); - config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), _attr[f].stop); - config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(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").arg(f); + str = TQString(prefix+"FieldForced%1").tqarg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f)); setFieldStop(f, str); - str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index 422cd35c..1604a51c 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 children(). + * items on demand, reimplement tqchildren(). */ class TreeMapItem: public StoredDrawParams { @@ -257,7 +257,7 @@ public: // force a redraw of this item void redraw(); - // delete all children + // delete all tqchildren void clear(); // force new child generation & refresh @@ -297,7 +297,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& itemRect() const { return _rect; } + const TQRect& tqitemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -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 children. + * again after inserting all tqchildren. */ 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 children of this item, you can + * change). If this is only true for the tqchildren 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 children on demand - virtual TreeMapItemList* children(); + // not const as this can create tqchildren on demand + virtual TreeMapItemList* tqchildren(); protected: - TreeMapItemList* _children; + TreeMapItemList* _tqchildren; double _sum, _value; private: @@ -379,7 +379,7 @@ private: int _sortTextNo; bool _sortAscending; - // temporary layout + // temporary tqlayout TQRect _rect; TQPtrList* _freeRects; int _depth; @@ -444,7 +444,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected children or parents stays true. + * has no selected tqchildren 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 children of + * Clear selection of all selected items which are tqchildren 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 children between but excluding the child + * range of direct tqchildren 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 children value() is almost the parents sum(), + * If a tqchildren 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 children. + * Redraws an item with all tqchildren. * This takes changed values(), sums(), colors() and text() into account. */ void redraw(TreeMapItem*); diff --git a/kcachegrind/kcachegrind/utils.h b/kcachegrind/kcachegrind/utils.h index 7256f054..06052a61 100644 --- a/kcachegrind/kcachegrind/utils.h +++ b/kcachegrind/kcachegrind/utils.h @@ -86,7 +86,7 @@ class FixString { bool stripInt64(int64&, bool stripSpaces = true); operator TQString() const - { return TQString::fromLatin1(_str,_len); } + { return TQString::tqfromLatin1(_str,_len); } private: const char* _str; diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui index fb45eda1..35b9a97e 100644 --- a/kioslave/svn/ksvnd/commitdlg.ui +++ b/kioslave/svn/ksvnd/commitdlg.ui @@ -21,7 +21,7 @@ - layout2 + tqlayout2 @@ -42,7 +42,7 @@ - layout1 + tqlayout1 @@ -58,7 +58,7 @@ Expanding - + 220 20 diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp index ddc7fb3e..fb96c9af 100644 --- a/kioslave/svn/ksvnd/ksvnd.cpp +++ b/kioslave/svn/ksvnd/ksvnd.cpp @@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { return false; } -int KSvnd::getStatus( const KURL::List& list ) { +int KSvnd::gettqStatus( const KURL::List& list ) { int result = 0; uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) { @@ -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" ) ) //parent has a .svn ? + if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? parentshavesvn++; } if ( files > 0 ) @@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) { TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { TQStringList result; - int listStatus = getStatus( list ); + int listtqStatus = gettqStatus( list ); - if ( !(listStatus & SomeAreInParentsEntries) && - !(listStatus & SomeAreExternalToParent) && - !(listStatus & SomeHaveSvn)) { - if( list.size() == 1 && listStatus & SomeAreFolders) { + if ( !(listtqStatus & SomeAreInParentsEntries) && + !(listtqStatus & SomeAreExternalToParent) && + !(listtqStatus & SomeHaveSvn)) { + if( list.size() == 1 && listtqStatus & SomeAreFolders) { result << "Checkout"; result << "Export"; // result << "CreateRepository"; result << "Import"; } - } else if ( (listStatus & AllAreInParentsEntries) ) { + } else if ( (listtqStatus & AllAreInParentsEntries) ) { result << "Diff"; //In SVN // result << "ShowLog"; @@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // result << "Update to revision..." result << "Rename"; result << "Delete"; - if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { + if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { result << "Revert"; // result << "Cleanup"; } @@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // result << "BranchTag"; result << "Switch"; result << "Merge"; - if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { + if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { // result << "Export"; // result << "Relocate"; result << "_SEPARATOR_"; result << "Add"; } result << "_SEPARATOR_"; - if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) { + if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) { result << "Blame"; } result << "CreatePatch"; - if( list.size() == 1 && listStatus & SomeAreFolders) { + if( list.size() == 1 && listtqStatus & SomeAreFolders) { // result << "ApplyPatchToFolder"; } } @@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { TQStringList result; - int listStatus = getStatus( list ); + int listtqStatus = gettqStatus( list ); - if ( ( listStatus & AllParentsHaveSvn && - ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) - || ( listStatus & SomeHaveSvn ) ) + if ( ( listtqStatus & AllParentsHaveSvn && + ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) + || ( listtqStatus & SomeHaveSvn ) ) ) { result << "Update"; result << "Commit"; diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h index bf10429c..78583e02 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 parent is added. InRepos means itself is added + //note: InSVN means tqparent 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 &); @@ -56,7 +56,7 @@ k_dcop: k_dcop_signals: //emitted whenever something happens using subversion ;) // void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&); -// void subversionStatus(const TQString&,int,int,int,int,long int); +// void subversiontqStatus(const TQString&,int,int,int,int,long int); public slots: @@ -64,7 +64,7 @@ protected: bool isFileInSvnEntries ( const TQString filename, const TQString entfile ); bool isFileInExternals ( const TQString filename, const TQString propfile ); bool isFolder( const KURL& url ); - int getStatus( const KURL::List& list ); + int gettqStatus( const KURL::List& list ); }; #endif diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp index 9d06c516..362852d3 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...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( 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." ).arg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).tqarg(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" ).arg( path ); + userstring = i18n( "A (bin) %1" ).tqarg( path ); else - userstring = i18n( "A %1" ).arg( path ); + userstring = i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_copy: //copy break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).arg( path ); + userstring = i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).arg( path ); + userstring=i18n( "Restored %1." ).tqarg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).arg( path ); + userstring=i18n( "Reverted %1." ).tqarg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").arg( path ); + userstring=i18n("Skipped missing target %1.").tqarg( path ); else - userstring=i18n("Skipped %1.").arg( path ); + userstring=i18n("Skipped %1.").tqarg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( 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.").arg( revision ); + userstring = i18n("Exported external at revision %1.").tqarg( revision ); else - userstring = i18n("Exported revision %1.").arg( revision ); + userstring = i18n("Exported revision %1.").tqarg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").arg( revision ); + userstring = i18n("Checked out external at revision %1.").tqarg( revision ); else - userstring = i18n("Checked out revision %1.").arg( revision); + userstring = i18n("Checked out revision %1.").tqarg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").arg( revision ); + userstring=i18n("Updated external to revision %1.").tqarg( revision ); else - userstring = i18n("Updated to revision %1.").arg( revision); + userstring = i18n("Updated to revision %1.").tqarg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").arg( revision ); + userstring = i18n("External at revision %1.").tqarg( revision ); else - userstring = i18n("At revision %1.").arg( revision); + userstring = i18n("At revision %1.").tqarg( 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." ).arg( path ); + userstring = i18n("Fetching external item into %1." ).tqarg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").arg( revision ); + userstring = i18n( "Status against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").arg( path ); + userstring = i18n("Performing status on external item at %1.").tqarg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").arg( path ); + userstring = i18n( "Sending %1").tqarg( 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.").arg( path ); + userstring = i18n( "Adding (bin) %1.").tqarg( path ); } else { - userstring = i18n( "Adding %1.").arg( path ); + userstring = i18n( "Adding %1.").tqarg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").arg( path ); + userstring = i18n( "Deleting %1.").tqarg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").arg( path ); + userstring = i18n( "Replacing %1.").tqarg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp index 19f08621..3456b3fd 100644 --- a/kioslave/svn/svnhelper/kio_svn_helper.cpp +++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp @@ -40,11 +40,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include SvnHelper::SvnHelper():KApplication() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui index 8f583932..3ed752e7 100644 --- a/kioslave/svn/svnhelper/subversioncheckout.ui +++ b/kioslave/svn/svnhelper/subversioncheckout.ui @@ -32,7 +32,7 @@ - layout8 + tqlayout8 @@ -76,7 +76,7 @@ Expanding - + 20 20 @@ -131,7 +131,7 @@ - layout4 + tqlayout4 @@ -155,7 +155,7 @@ Expanding - + 121 20 diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui index a624e6bb..e647f6b6 100644 --- a/kioslave/svn/svnhelper/subversiondiff.ui +++ b/kioslave/svn/svnhelper/subversiondiff.ui @@ -60,7 +60,7 @@ Expanding - + 20 20 diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui index e6135a8e..20060f73 100644 --- a/kioslave/svn/svnhelper/subversionlog.ui +++ b/kioslave/svn/svnhelper/subversionlog.ui @@ -60,7 +60,7 @@ Expanding - + 20 20 diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui index 1e48b29e..c0642bc4 100644 --- a/kioslave/svn/svnhelper/subversionswitch.ui +++ b/kioslave/svn/svnhelper/subversionswitch.ui @@ -32,7 +32,7 @@ - layout8 + tqlayout8 @@ -76,7 +76,7 @@ Expanding - + 20 20 @@ -131,7 +131,7 @@ - layout4 + tqlayout4 @@ -155,7 +155,7 @@ Expanding - + 121 20 diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp index ca246038..8c10c4a2 100644 --- a/kmtrace/demangle.cpp +++ b/kmtrace/demangle.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 0d27471e..0c3dd137 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp index 2e35651e..add7cf3c 100644 --- a/kmtrace/match.cpp +++ b/kmtrace/match.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ int main(int argc, char **argv) while(!feof(map_file)) { fgets(buf, 1024, map_file); - TQString line = TQString::fromLatin1(buf).stripWhiteSpace(); + TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace(); TQStringList split = TQStringList::split(' ', line); if (split.count() <= 1) return 1; @@ -61,7 +61,7 @@ int main(int argc, char **argv) while(!feof(call_file)) { fgets(buf, 1024, call_file); - TQString line = TQString::fromLatin1(buf).stripWhiteSpace(); + TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace(); if (dict.find(line)) { qWarning("%s", line.latin1()); diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 43814746..bb1c71a9 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -258,7 +258,7 @@ void KompareShell::setupStatusBar() m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" ); statusBar()->addWidget( m_generalLabel, 1, false ); - m_generalLabel->setAlignment( TQt::AlignLeft ); + m_generalLabel->tqsetAlignment( TQt::AlignLeft ); } void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ) @@ -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 ).arg( modelIndex + 1 ); + fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( 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 ) - .arg( differenceIndex + 1 ).arg( appliedCount ); + .tqarg( differenceIndex + 1 ).tqarg( appliedCount ); else diffStr = i18n( " %n difference ", " %n differences ", differenceCount ); @@ -438,7 +438,7 @@ void KompareShell::slotShowTextView() // FIXME: proper error checking m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") ); m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery( - TQString::fromLatin1("KTextEditor/Document"), + TQString::tqfromLatin1("KTextEditor/Document"), TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode ); if ( m_textViewPart ) { diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 9f9d775e..1a402260 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 children, check if dir already exists, if so addModel + { // has tqchildren, 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 c11bbe8e..3c110857 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -21,7 +21,7 @@ #include "kompare_qsplitter.h" // make sure we get there first -#include +#include #include #include @@ -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." ).arg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 cannot be downloaded." ).tqarg( 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." ).arg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 does not exist on your system." ).tqarg( url.prettyURL() ) ); return tempFileName; } } @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).arg( source ); + text = i18n( "Viewing diff output from %1" ).tqarg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .arg( m_info.source.prettyURL() ) - .arg( m_info.destination.prettyURL() ); + .tqarg( m_info.source.prettyURL() ) + .tqarg( 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") - .arg(oldFile).arg(newFile).arg(diffFormat) - .arg(noOfHunks).arg(noOfDiffs), + .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) + .tqarg(noOfHunks).tqarg(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") - .arg(filesInDiff).arg(diffFormat).arg(oldFile) - .arg(newFile).arg(noOfHunks).arg(noOfDiffs), + .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) + .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } } diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 2bccc48b..4d7bd603 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left, m_label ( "", this ), m_layout ( this ) { - setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); - m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); + m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); m_label.setMargin(3); TQFrame* bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_layout.setSpacing(0); m_layout.setMargin(0); @@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame() { } -TQSize KompareConnectWidgetFrame::sizeHint() const +TQSize KompareConnectWidgetFrame::tqsizeHint() const { - return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) ); + return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) ); } static int kMouseOffset; @@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi { // connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) ); setBackgroundMode( NoBackground ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setFocusProxy( parent->parentWidget() ); } @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) @@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ ) if ( TQApplication::reverseLayout() ) { - leftRect = m_rightView->itemRect( i ); - rightRect = m_leftView->itemRect( i ); + leftRect = m_rightView->tqitemRect( i ); + rightRect = m_leftView->tqitemRect( i ); } else { - leftRect = m_leftView->itemRect( i ); - rightRect = m_rightView->itemRect( i ); + leftRect = m_leftView->tqitemRect( i ); + rightRect = m_rightView->tqitemRect( i ); } int tl = leftRect.top(); diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h index ec48ff61..cc22ed86 100644 --- a/kompare/komparepart/kompareconnectwidget.h +++ b/kompare/komparepart/kompareconnectwidget.h @@ -76,7 +76,7 @@ public: ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); ~KompareConnectWidgetFrame(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; KompareConnectWidget* wid() { return &m_wid; } diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 30e65d87..f8779fa9 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource, m_label ( isSource?"Source":"Dest", this ), m_layout ( this ) { - setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); TQFrame *bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_label.setMargin(3); m_layout.setSpacing(0); @@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference() return -1; } -TQRect KompareListView::itemRect( int i ) +TQRect KompareListView::tqitemRect( int i ) { TQListViewItem* item = itemAtIndex( i ); int x = 0; @@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply ) TQPtrDictIterator it ( m_itemDict ); for( ; it.current(); ++it ) it.current()->applyDifference( apply ); - repaint(); + tqrepaint(); } 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(); - repaint(); + tqrepaint(); } int KompareListViewDiffItem::maxHeight() @@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b ) m_sourceItem->firstChild() : m_destItem->firstChild(); while( item && item->isVisible() ) { - item->repaint(); + item->tqrepaint(); item = item->nextSibling(); } } diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index 0cbbefd7..b5de7661 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -55,7 +55,7 @@ public: KompareListViewItem* itemAtIndex( int i ); int firstVisibleDifference(); int lastVisibleDifference(); - TQRect itemRect( int i ); + TQRect tqitemRect( int i ); int minScrollId(); int maxScrollId(); int contentsWidth(); diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 47cfc893..7636a27f 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 7087ca4d..5e30652c 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -44,25 +44,25 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, // Set up the scrollFrame scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); - scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth)); - TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0); + scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); + TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0); m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame ); - pairlayout->addWidget( m_vScroll, 0, 1 ); + pairtqlayout->addWidget( m_vScroll, 0, 1 ); m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame ); - pairlayout->addWidget( m_hScroll, 1, 0 ); + pairtqlayout->addWidget( m_hScroll, 1, 0 ); new KompareListViewFrame(true, m_settings, this, "source"); new KompareListViewFrame(false, m_settings, this, "destination"); - pairlayout->addWidget( this, 0, 0 ); + pairtqlayout->addWidget( this, 0, 0 ); // set up our looks setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) ); + setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) ); setHandleWidth(50); setChildrenCollapsible( false ); setFrameStyle( TQFrame::NoFrame ); - setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); setOpaqueResize( true ); setFocusPolicy( TQ_WheelFocus ); @@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->sizeHint() ); + s->sizer = pick( newHandle->tqsizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -184,7 +184,7 @@ void KompareSplitter::childEvent( TQChildEvent *c ) } } -// This is from a private qt header (kernel/qlayoutengine_p.h). sorry. +// This is from a private qt header (kernel/qtqlayoutengine_p.h). sorry. TQSize qSmartMinSize( TQWidget *w ); static TQPoint toggle( TQWidget *w, TQPoint pos ) @@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w ) if ( isCollapsed(w) ) { return toggle( w, w->pos() ) - TQPoint( 1, 1 ); } else { - return w->geometry().bottomRight(); + return w->tqgeometry().bottomRight(); } } @@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, : pick( bottomRight(w) ) - pos + 1; if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) { dd = TQMAX( pick(qSmartMinSize(w)), - TQMIN(dd, pick(w->maximumSize())) ); + TQMIN(dd, pick(w->tqmaximumSize())) ); } else { dd = 0; } @@ -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()->repaint(); + ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint(); } // Scrolling stuff diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index e8ad94fe..8e6d55e5 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -203,19 +203,19 @@ void DiffPage::slotExcludeFileToggled( bool on ) void DiffPage::addDiffTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff program selector m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page ); - layout->addWidget( m_diffProgramGroup ); + tqlayout->addWidget( m_diffProgramGroup ); m_diffProgramGroup->setMargin( KDialog::marginHint() ); m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" ); TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Diff" ) ); @@ -224,14 +224,14 @@ void DiffPage::addDiffTab() void DiffPage::addFormatTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff modes m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page ); TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) ); - layout->addWidget( m_modeButtonGroup ); + tqlayout->addWidget( m_modeButtonGroup ); m_modeButtonGroup->setMargin( KDialog::marginHint() ); TQRadioButton* radioButton; @@ -245,7 +245,7 @@ void DiffPage::addFormatTab() // #lines of context (loc) TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox->setMargin( KDialog::marginHint() ); TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox ); @@ -253,7 +253,7 @@ void DiffPage::addFormatTab() TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) ); label->setBuddy( m_locSpinBox ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Format" ) ); @@ -262,13 +262,13 @@ void DiffPage::addFormatTab() void DiffPage::addOptionsTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff options TQVButtonGroup* optionButtonGroup = new TQVButtonGroup( i18n( "General" ), page ); - layout->addWidget( optionButtonGroup ); + tqlayout->addWidget( optionButtonGroup ); optionButtonGroup->setMargin( KDialog::marginHint() ); m_smallerCheckBox = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup ); @@ -278,7 +278,7 @@ void DiffPage::addOptionsTab() m_caseCheckBox = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup ); TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) ); - TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" ); + TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" ); groupLayout->setMargin( KDialog::marginHint() ); m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page ); @@ -298,7 +298,7 @@ void DiffPage::addOptionsTab() } TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page ); - layout->addWidget( moreOptionButtonGroup ); + tqlayout->addWidget( moreOptionButtonGroup ); moreOptionButtonGroup->setMargin( KDialog::marginHint() ); m_tabsCheckBox = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup ); @@ -312,7 +312,7 @@ void DiffPage::addOptionsTab() m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup ); TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "O&ptions" ) ); @@ -321,16 +321,16 @@ void DiffPage::addOptionsTab() void DiffPage::addExcludeTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page ); m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox ); TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) ); m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove ); TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) ); - layout->addWidget( excludeFilePatternGroupBox ); + tqlayout->addWidget( excludeFilePatternGroupBox ); connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool))); @@ -342,11 +342,11 @@ void DiffPage::addExcludeTab() TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) ); m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" ); TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) ); - layout->addWidget( excludeFileNameGroupBox ); + tqlayout->addWidget( excludeFileNameGroupBox ); connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool))); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Exclude" ) ); diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 82276439..0bbc87fe 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -16,7 +16,7 @@ ** ***************************************************************************/ -#include +#include #include #include @@ -34,9 +34,9 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false ) { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page ); m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" ); @@ -54,11 +54,11 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" ); m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() ); - layout->addWidget( m_firstGB ); - layout->addWidget( m_secondGB ); - layout->addWidget( m_thirdGB ); + tqlayout->addWidget( m_firstGB ); + tqlayout->addWidget( m_secondGB ); + tqlayout->addWidget( m_thirdGB ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Files" ) ); diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp index 3a35e479..33c45dba 100644 --- a/kompare/libdialogpages/pagebase.cpp +++ b/kompare/libdialogpages/pagebase.cpp @@ -17,7 +17,7 @@ ** ***************************************************************************/ -#include +#include #include #include "pagebase.h" @@ -36,9 +36,9 @@ PageBase::~PageBase() TQSize PageBase::sizeHintForWidget( TQWidget* widget ) { // - // The size is computed by adding the sizeHint().height() of all - // widget children and taking the width of the widest child and adding - // layout()->margin() and layout()->spacing() + // The size is computed by adding the tqsizeHint().height() of all + // widget tqchildren and taking the width of the widest child and adding + // tqlayout()->margin() and tqlayout()->spacing() // // this code in this method has been ripped out of a file in kbabel @@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) numChild += 1; TQWidget *w=((TQWidget*)o); - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); if( s.isEmpty() == true ) { s = TQSize( 50, 100 ); // Default size @@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) if( numChild > 0 ) { - size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) ); - size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 ); + size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) ); + size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 ); } else { diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index ab80506c..827e8a4d 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -36,45 +36,45 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) { TQWidget* page; - TQVBoxLayout* layout; - TQGroupBox* colorGroupBox; + TQVBoxLayout* tqlayout; + TQGroupBox* tqcolorGroupBox; TQHGroupBox* snolGroupBox; TQHGroupBox* tabGroupBox; TQLabel* label; page = new TQWidget( this ); - layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add a groupbox - colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); - layout->addWidget( colorGroupBox ); - colorGroupBox->setMargin( KDialog::marginHint() ); + tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); + tqlayout->addWidget( tqcolorGroupBox ); + tqcolorGroupBox->setMargin( KDialog::marginHint() ); // add the removeColor - label = new TQLabel( i18n( "Removed color:" ), colorGroupBox ); - m_removedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox ); + m_removedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_removedColorButton ); // add the changeColor - label = new TQLabel( i18n( "Changed color:" ), colorGroupBox ); - m_changedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox ); + m_changedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_changedColorButton ); // add the addColor - label = new TQLabel( i18n( "Added color:" ), colorGroupBox ); - m_addedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox ); + m_addedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_addedColorButton ); // add the appliedColor - label = new TQLabel( i18n( "Applied color:" ), colorGroupBox ); - m_appliedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox ); + m_appliedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_appliedColorButton ); // scroll number of lines (snol) snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page ); - layout->addWidget( snolGroupBox ); + tqlayout->addWidget( snolGroupBox ); snolGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of lines:" ), snolGroupBox ); @@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) // Temporarily here for testing... // number of spaces for a tab character stuff tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page ); - layout->addWidget( tabGroupBox ); + tqlayout->addWidget( tabGroupBox ); tabGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox ); m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox ); label->setBuddy( m_tabSpinBox ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "A&ppearance" ) ); page = new TQWidget( this ); - layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page ); - layout->addWidget( gb ); + tqlayout->addWidget( gb ); gb->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Font:" ), gb ); @@ -113,7 +113,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" ); label->setBuddy( m_fontSizeSpinBox ); - layout->addStretch( 1 ); + tqlayout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Fonts" ) ); diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h index 87b8f556..4e440222 100644 --- a/kompare/libdiff2/difference.h +++ b/kompare/libdiff2/difference.h @@ -130,7 +130,7 @@ public: protected: void calculateHash() { - unsigned short const* str = reinterpret_cast( m_string.unicode() ); + unsigned short const* str = reinterpret_cast( m_string.tqunicode() ); const unsigned int len = m_string.length(); m_hash = 1315423911; diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index 3b48d796..efa7e12d 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -97,16 +97,16 @@ TQString DiffHunk::recreateHunk() const } // recreate header - hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .arg( m_sourceLine ) - .arg( m_destinationLine ) - .arg( slc ) - .arg( dlc ); + hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" ) + .tqarg( m_sourceLine ) + .tqarg( m_destinationLine ) + .tqarg( slc ) + .tqarg( dlc ); if ( !m_function.isEmpty() ) hunk += " " + m_function; - hunk += TQString::fromLatin1( "\n" ); + hunk += TQString::tqfromLatin1( "\n" ); hunk += differences; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 1b3822b0..cd348dfc 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const TQString diff; // recreate header - TQString tab = TQString::fromLatin1( "\t" ); - TQString nl = TQString::fromLatin1( "\n" ); - diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); + TQString tab = TQString::tqfromLatin1( "\t" ); + TQString nl = TQString::tqfromLatin1( "\n" ); + diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); + diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( 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 fc27fb56..89912eac 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -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." ).arg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( 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." ).arg( diff ).arg( file ) ); + emit( i18n( "There were problems applying the diff %1 to the file %2." ).tqarg( diff ).tqarg( 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." ).arg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( 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." ).arg( diff ).arg( dir ) ); + emit error( i18n( "There were problems applying the diff %1 to the folder %2." ).tqarg( diff ).tqarg( 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." ).arg( temp->name() ) ); + emit error( i18n( "Could not write to the temporary file %1, deleting it." ).tqarg( 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." ).arg( m_destination ).arg( 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." ).tqarg( m_destination ).tqarg( temp->name() ) ); } else { diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index df1c5b14..db165ae5 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp index 7e4ddbbe..c031ee61 100644 --- a/kompare/libdiff2/levenshteintable.cpp +++ b/kompare/libdiff2/levenshteintable.cpp @@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference unsigned int m = s.length(); unsigned int n = d.length(); - const TQChar* sq = s.unicode(); - const TQChar* dq = d.unicode(); + const TQChar* sq = s.tqunicode(); + const TQChar* dq = d.tqunicode(); if ( m == 1 ) return --n; diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index 0e0a2aef..b0d54157 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader() destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader() else { kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl; } } @@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader() destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader() else { kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl; } } @@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader() destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) ); // kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; // kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; -// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; // kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; // kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader() else { // kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl; } } diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index cef4f0cf..1d6eaac3 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index 1da3a860..6877889c 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -91,7 +91,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -747,7 +747,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -755,7 +755,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index 0c8a20fb..63dbb88a 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -12,7 +12,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index e6a6e040..788b469d 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -66,7 +66,7 @@ diff -u -r1.26 dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -668,7 +668,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 38db371e..76c3f974 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -737,7 +737,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -745,7 +745,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 7763ce5e..4296e44f 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -659,7 +659,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + QString f = func; // Qt is better with tqunicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp index 87f018bb..0fa16c86 100644 --- a/kspy/classinfoview.cpp +++ b/kspy/classinfoview.cpp @@ -41,7 +41,7 @@ ClassInfoView::~ClassInfoView() void ClassInfoView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); for (int index = 0; index < mo->numClassInfo(true); index++) { const TQClassInfo * classInfo = mo->classInfo(index, true); diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp index 8d099a94..93747c28 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 alignment ) + int column, int width, int tqalignment ) { 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, alignment); + TQListViewItem::paintCell(p, color_cg, column, width, tqalignment); } else { - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } } }; @@ -69,7 +69,7 @@ PropsView::~PropsView() void PropsView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); TQStrList names = mo->propertyNames( true ); for ( uint i = 0; i < names.count(); i++ ) { @@ -95,60 +95,60 @@ void PropsView::buildList( TQObject *o ) case TQVariant::Cursor: { TQCursor c = v.toCursor(); - val = TQString("shape=%1").arg(c.shape()); + val = TQString("tqshape=%1").tqarg(c.tqshape()); break; } case TQVariant::Font: { TQFont f = v.toFont(); val = TQString("family=%1, pointSize=%2, weight=%3, italic=%4, bold=%5, underline=%6, strikeOut=%7") - .arg(f.family()) - .arg(f.pointSize()) - .arg(f.weight()) - .arg(f.italic()) - .arg(f.bold()) - .arg(f.underline()) - .arg(f.strikeOut()); + .tqarg(f.family()) + .tqarg(f.pointSize()) + .tqarg(f.weight()) + .tqarg(f.italic()) + .tqarg(f.bold()) + .tqarg(f.underline()) + .tqarg(f.strikeOut()); break; } case TQVariant::Int: val.setNum( v.toInt() ); if (mp->isEnumType()) { #ifdef USE_QT4 -// TQMetaObject * metaObject = *(mp->meta); // FIXME - val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt())); // FIXME +// TQMetaObject * tqmetaObject = *(mp->meta); // FIXME + val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt())); // FIXME #else // USE_QT4 - TQMetaObject * metaObject = *(mp->meta); - val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt())); + TQMetaObject * tqmetaObject = *(mp->meta); + val = TQString("%1::%2").tqarg(tqmetaObject->className()).tqarg(mp->valueToKey(val.toInt())); #endif // USE_QT4 } break; case TQVariant::Point: { TQPoint p = v.toPoint(); - val = TQString("x=%1, y=%2").arg(p.x()).arg(p.y()); + val = TQString("x=%1, y=%2").tqarg(p.x()).tqarg(p.y()); break; } case TQVariant::Rect: { TQRect r = v.toRect(); val = TQString("left=%1, right=%2, top=%3, bottom=%4") - .arg(r.left()) - .arg(r.right()) - .arg(r.top()) - .arg(r.bottom()); + .tqarg(r.left()) + .tqarg(r.right()) + .tqarg(r.top()) + .tqarg(r.bottom()); break; } case TQVariant::Size: { TQSize s = v.toSize(); - val = TQString("width=%1, height=%2").arg(s.width()).arg(s.height()); + val = TQString("width=%1, height=%2").tqarg(s.width()).tqarg(s.height()); break; } case TQVariant::SizePolicy: { TQSizePolicy s = v.toSizePolicy(); - val = TQString("horData=%1, verData=%2").arg(s.horData()).arg(s.verData()); + val = TQString("horData=%1, verData=%2").tqarg(s.horData()).tqarg(s.verData()); break; } case TQVariant::Double: diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp index 9cf31c31..36e06e63 100644 --- a/kspy/receiversview.cpp +++ b/kspy/receiversview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - receiversview.cpp - description + tqreceiversview.cpp - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include @@ -28,7 +28,7 @@ class UnencapsulatedTQObject : public TQObject { public: - TQConnectionList *public_receivers(int signal) const { return receivers(signal); } + TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); } }; ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name) @@ -48,13 +48,13 @@ ReceiversView::~ReceiversView() void ReceiversView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o; TQStrList signalNames = mo->signalNames(true); for (int sig = 0; sig < mo->numSignals(true); sig++) { - TQConnectionList * clist = qobject->public_receivers(sig); + TQConnectionList * clist = qobject->public_tqreceivers(sig); if (clist != 0) { KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) ); diff --git a/kspy/receiversview.h b/kspy/receiversview.h index a0498b67..6e703472 100644 --- a/kspy/receiversview.h +++ b/kspy/receiversview.h @@ -1,5 +1,5 @@ /*************************************************************************** - receiversview.h - description + tqreceiversview.h - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp index d6fdba24..97d024fb 100644 --- a/kspy/sigslotview.cpp +++ b/kspy/sigslotview.cpp @@ -40,7 +40,7 @@ SigSlotView::~SigSlotView() void SigSlotView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); KListViewItem *sigs = new KListViewItem( this, "Signals" ); TQStrList sigList = mo->signalNames( true ); diff --git a/kspy/spy.cpp b/kspy/spy.cpp index ec5d099d..1ef024d0 100644 --- a/kspy/spy.cpp +++ b/kspy/spy.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -47,10 +47,10 @@ extern "C" Spy::Spy( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6 ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6 ); TQSplitter *div = new TQSplitter( this ); - layout->addWidget( div ); + tqlayout->addWidget( div ); TQVBox *leftPane = new TQVBox( div ); @@ -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, "receivers view" ); + mReceiversView = new ReceiversView( tabs, "tqreceivers view" ); tabs->addTab( mReceiversView, i18n( "Receivers" ) ); mClassInfoView = new ClassInfoView( tabs, "class info view" ); diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index e683c92c..ca8dfcec 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index f2ae01cb..b710ce95 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -153,11 +153,11 @@ 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()->repaint(); + m_part->widget()->tqrepaint(); // resize app to be as large as desired size adjustSize(); // Disable the saving of the size - setAutoSaveSettings(TQString::fromLatin1("MainWindow"), false); + setAutoSaveSettings(TQString::tqfromLatin1("MainWindow"), false); } TQPixmap pixmap = TQPixmap::grabWidget( m_part->widget() ); pixmap.save( filename, "PNG" ); diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index 38b73f57..d4d3fc21 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -205,7 +205,7 @@ void KUIViewerPart::slotGrab() return; } - TQClipboard *clipboard = TQApplication::clipboard(); + TQClipboard *clipboard = TQApplication::tqclipboard(); clipboard->setPixmap(TQPixmap::grabWidget(m_widget)); } diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp index c2d770f1..4644d0e5 100644 --- a/kunittest/runnergui.cpp +++ b/kunittest/runnergui.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -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") - .arg(Runner::self()->numberOfTestCases()) - .arg(Runner::self()->numberOfPassedTests()) - .arg(Runner::self()->numberOfFailedTests()) - .arg(Runner::self()->numberOfSkippedTests()) - .arg(Runner::self()->numberOfTests()) ); + .tqarg(Runner::self()->numberOfTestCases()) + .tqarg(Runner::self()->numberOfPassedTests()) + .tqarg(Runner::self()->numberOfFailedTests()) + .tqarg(Runner::self()->numberOfSkippedTests()) + .tqarg(Runner::self()->numberOfTests()) ); else - m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").arg(Runner::self()->numberOfTestCases())); + m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").tqarg(Runner::self()->numberOfTestCases())); } void RunnerGUI::addTestResult(const char *name, Tester *test) @@ -211,7 +211,7 @@ namespace KUnitTest if ( test->inherits("KUnitTest::SlotTester") ) { - TQStrList allSlots = test->metaObject()->slotNames(); + TQStrList allSlots = test->tqmetaObject()->slotNames(); for ( char *sl = allSlots.first(); sl; sl = allSlots.next() ) { if ( TQString(sl).startsWith("test") ) diff --git a/kunittest/testerwidget.ui b/kunittest/testerwidget.ui index e6e92e1c..1f294c02 100644 --- a/kunittest/testerwidget.ui +++ b/kunittest/testerwidget.ui @@ -156,7 +156,7 @@ 0 - + 0 200 @@ -167,7 +167,7 @@ m_teDetails - + 600 200 diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp index a36ffd15..7eb883c2 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 children */ + /** Get the first child of this node; null if no tqchildren */ 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 584cee6d..f83bec10 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 children nodes correctly. + * a simple list not a tree. Handles null tqchildren 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 7b93c1ef..bf1e1629 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 children */ + /** Get the first child of this node; null if no tqchildren */ 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 children */ + /** Remove all tqchildren */ 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 e44386f7..66902522 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 children of root. + // copy all tqchildren 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 children nodes correctly. + * a simple list not a tree. Handles null tqchildren 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 children; + // link in tqchildren; for (unsigned int i=1; iequalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any children for matches + // regardless of match or not, check any tqchildren 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 children. + // if roots match, do full list match test on tqchildren. 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 children. + // if roots match, do partial list match test on tqchildren. 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 children. + // if roots match, do full list match test on tqchildren. 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 children. + // if roots match, do full list partial match test on tqchildren. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; diff --git a/poxml/lauri.po b/poxml/lauri.po index 6384835c..c28eeb2f 100644 --- a/poxml/lauri.po +++ b/poxml/lauri.po @@ -299,7 +299,7 @@ msgstr "Der schlimme Teil" msgid "Ending Text:" msgstr "Ende:" -#. Tag: literallayout +#. Tag: literaltqlayout #: lauri.xml:143 #, no-c-format msgid "" diff --git a/poxml/lauri.xml b/poxml/lauri.xml index 18a1e08a..35448f0c 100644 --- a/poxml/lauri.xml +++ b/poxml/lauri.xml @@ -165,7 +165,7 @@ editor. Ending Text: - + Matthias Hoelzer KDE-Verein i.G. Account-Nr. 2798296 @@ -180,7 +180,7 @@ SWIFT-Address: BYLA DE 77 print "$b4 /path/to/KDE/libs/libpng.a $af\n"; \ you see it here whereever - + diff --git a/poxml/parser.cpp b/poxml/parser.cpp index be06d80a..b4f0161b 100644 --- a/poxml/parser.cpp +++ b/poxml/parser.cpp @@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl "revdescription", "glossentry", "partinfo", "segmentedlist", "segtitle", "seg", "seglistitem", "screenco", 0}; -static const char *literaltags[] = {"literallayout", "synopsis", "screen", +static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen", "programlisting", 0}; bool StructureParser::fatalError ( const TQXmlParseException &e ) @@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName) bool StructureParser::skippedEntity ( const TQString & name ) { if (inside) - message += TQString("&%1;").arg(name); + message += TQString("&%1;").tqarg(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\"").arg(attr.qName(i)).arg(attr.value(i)); + tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i)); } - tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); - tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); + tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); + tmp += TQString(" poxml_col=\"%1\"").tqarg(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("]").arg(tag)), index); - int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index); + int nextclose = message.find(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)), index); + int nextstart = message.find(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(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.at(index).latin1()) { + switch (message.tqat(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").arg(singletags[index]) && + if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(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("]").arg(tag)), + int closing_index = message.find(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)), strindex); - int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.find(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(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("]").arg(tag)), + int closing_index = message.findRev(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)), strindex - 1); - int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.findRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(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\"").arg(locator->columnNumber()); + message += TQString("lineNumber()); + message += TQString(" poxml_col=\"%1\"").tqarg(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>]").arg(literaltags[index])); - TQRegExp end(TQString("]").arg(literaltags[index])); + TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index])); + TQRegExp end(TQString("]").tqarg(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("").arg(tag)); + contents.replace(index, unclosed.matchedLength(), TQString("").tqarg(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>").arg(tag).arg(cut)); + contents.replace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(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>").arg(tag).arg(singletag.cap(2)).arg(tag)); + contents.replace(index, singletag.matchedLength(), TQString("<%1 %2>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(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").arg(msgid)); + contents.replace(index, trans_comment.matchedLength(), TQString("%1").tqarg(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]*").arg(tag).arg(tag)); + TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*").tqarg(tag).tqarg(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.at(endindex).latin1()) { + switch (contents.tqat(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>").arg((*it).tag) + (*it).msgid + - TQString("").arg((*it).tag); + (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid + + TQString("").tqarg((*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>").arg((*it2).tag) + msgid + TQString("").arg((*it2).tag); + (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("").tqarg((*it2).tag); } break; } diff --git a/poxml/split.cpp b/poxml/split.cpp index 29104d3e..db20f15f 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").arg(counter++); + mb.msgid = TQString::tqfromLatin1("appended paragraph %1").tqarg(counter++); mb.msgstr = (*tit).msgid; mb.lines += (*tit).lines; english.append(mb); diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp index bfc2e9cf..cd3a78be 100644 --- a/poxml/transxx.cpp +++ b/poxml/transxx.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program " ); headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language " ); TQString revisionDate ( "PO-Revision-Date: " ); - const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC ); + const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC ); revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" ); headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate ); headerLines << "Plural-Forms: nplurals=1; plural=0;"; diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp index 345a53e6..658e557b 100644 --- a/poxml/xml2pot.cpp +++ b/poxml/xml2pot.cpp @@ -33,7 +33,7 @@ int main( int argc, char **argv ) } } - const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC ); + const TQDateTime now = TQDateTime::tqcurrentDateTime( Qt::UTC ); cout << "# SOME DESCRIPTIVE TITLE.\n"; cout << "# FIRST AUTHOR , YEAR.\n"; diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 60585b2a..5d8d3582 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -729,7 +729,7 @@ static void renderViolations(const TQValueVector& violation // str.setLength() always does a deep copy, so the replacement code below is safe. parStr.setLength( len ); // compatible behaviour to the old implementation. Replace tabs by spaces - TQChar *chr = (TQChar*)parStr.unicode(); + TQChar *chr = (TQChar*)parStr.tqunicode(); int l = len; while ( l-- ) { @@ -900,10 +900,10 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) return; } - const TQObjectList children = widget->childrenListObject(); - if (children.isEmpty()) + const TQObjectList tqchildren = widget->childrenListObject(); + if (tqchildren.isEmpty()) return; - TQObjectListIterator iter(children); + TQObjectListIterator iter(tqchildren); TQObject* walk; while ((walk = iter.current())) @@ -918,7 +918,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) void StyleCheckStyle::slotAccelManage() { //Walk through top-levels - TQWidgetList* topLevels = TQApplication::topLevelWidgets(); + TQWidgetList* topLevels = TQApplication::tqtopLevelWidgets(); if (!topLevels) return; @@ -1058,7 +1058,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, if ( sunken ) kDrawBeButton( p, x, y, w, h, cg, true, - &cg.brush(TQColorGroup::Mid) ); + &cg.tqbrush(TQColorGroup::Mid) ); else if ( flags & Style_MouseOver ) { TQBrush brush(cg.button().light(110)); @@ -1071,7 +1071,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, else kDrawBeButton(p, x, y, w, h, cg, false, - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); break; } @@ -1392,7 +1392,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, case PE_WindowFrame: case PE_PanelLineEdit: { bool sunken = flags & Style_Sunken; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw == 2) { @@ -1502,8 +1502,8 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, p->save(); if ( flags & Style_Down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); if ( flags & Style_Enabled ) { a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 ); @@ -1705,7 +1705,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe, } -void StyleCheckStyle::drawControl( ControlElement element, +void StyleCheckStyle::tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1727,7 +1727,7 @@ void StyleCheckStyle::drawControl( ControlElement element, if ( btnDefault || button->autoDefault() ) { // Compensate for default indicator - static int di = pixelMetric( PM_ButtonDefaultIndicator ); + static int di = tqpixelMetric( PM_ButtonDefaultIndicator ); br.addCoords( di, di, -di, -di ); } @@ -1750,14 +1750,14 @@ void StyleCheckStyle::drawControl( ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), cg, flags, opt ); w -= dx; @@ -1786,7 +1786,7 @@ void StyleCheckStyle::drawControl( ControlElement element, // Make the label indicate if the button is a default button or not if ( active || button->isDefault() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::sizeHint(), but gives + // the same as computed in TQPushButton::tqsizeHint(), but gives // a reasonable bold effect. int i; @@ -1794,25 +1794,25 @@ void StyleCheckStyle::drawControl( ControlElement element, if (button->isEnabled()) // Don't draw double-shadow when disabled for(i=0; i<2; i++) drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), button->pixmap(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().dark() : &button->colorGroup().mid() ); + active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() ); // Normal Text for(i=0; i<2; i++) drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), button->pixmap(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); } else - drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); // Draw a focus rect if the button has focus if ( flags & Style_HasFocus ) drawPrimitive( PE_FocusRect, p, - TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget), + TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget), cg, flags ); break; } @@ -1828,7 +1828,7 @@ void StyleCheckStyle::drawControl( ControlElement element, TQRect tr = r; if ( t->identifier() == tb->currentTab() ) tr.setBottom( tr.bottom() - - pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) ); + tqpixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) ); TQValueVector violations = checkTitleStyle(t->text(), ShortTitle, HasAccels); renderViolations(violations, p, r, AlignCenter |ShowPrefix, t->text()); @@ -1846,18 +1846,18 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQCheckBox* checkbox = static_cast(widget); - int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector violations = checkSentenceStyle(checkbox->text()); - renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text()); + renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text()); - drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text()))); if (flags & Style_HasFocus) { - TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget); + TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget); drawPrimitive(PE_FocusRect, p, fr, cg, flags); } break; @@ -1867,18 +1867,18 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQRadioButton* rb = static_cast(widget); - int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector violations = checkSentenceStyle(rb->text()); - renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix, rb->text()); + renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix, rb->text()); - drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text()))); if (flags & Style_HasFocus) { - TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget); + TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget); drawPrimitive(PE_FocusRect, p, fr, cg, flags); } break; @@ -1933,7 +1933,7 @@ void StyleCheckStyle::drawControl( ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); int x, y, w, h; r.rect( &x, &y, &w, &h ); @@ -1964,7 +1964,7 @@ void StyleCheckStyle::drawControl( ControlElement element, // Do we have an icon? if ( mi->iconSet() ) { TQIconSet::Mode mode; - TQRect cr = visualRect( TQRect(x, y, checkcol, h), r ); + TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r ); // Select the correct icon from the iconset if ( active ) @@ -2110,8 +2110,8 @@ void StyleCheckStyle::drawControl( ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator); - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator); + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -2164,12 +2164,12 @@ void StyleCheckStyle::drawControl( ControlElement element, } default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void StyleCheckStyle::drawControlMask( ControlElement element, +void StyleCheckStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2190,12 +2190,12 @@ void StyleCheckStyle::drawControlMask( ControlElement element, } default: - KStyle::drawControlMask(element, p, widget, r, opt); + KStyle::tqdrawControlMask(element, p, widget, r, opt); } } -void StyleCheckStyle::drawComplexControl( ComplexControl control, +void StyleCheckStyle::tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2246,7 +2246,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, p->drawLine(x+1, y+2, x+1, y2-2); // Get the button bounding box - TQRect ar = TQStyle::visualRect( + TQRect ar = TQStyle::tqvisualRect( querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow), widget ); @@ -2265,7 +2265,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, if ( controls & SC_ComboBoxEditField ) { const TQComboBox * cb = (const TQComboBox *) widget; - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField), widget ); @@ -2289,7 +2289,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, p->fillRect( re.x(), re.y(), re.width(), re.height(), cg.brush( TQColorGroup::Highlight ) ); - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( subRect(SR_ComboBoxFocusRect, cb), widget); drawPrimitive( PE_FocusRect, p, re, cg, @@ -2377,14 +2377,14 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; } } -void StyleCheckStyle::drawComplexControlMask( ComplexControl control, +void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2406,7 +2406,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control, } default: - KStyle::drawComplexControlMask(control, p, widget, r, opt); + KStyle::tqdrawComplexControlMask(control, p, widget, r, opt); } } @@ -2422,11 +2422,11 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const int dbw1 = 0, dbw2 = 0; if (button->isDefault() || button->autoDefault()) { - dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget); + dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget); dbw2 = dbw1 * 2; } - int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2, + int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2, dfw2 = dfw1 * 2; return TQRect(wrect.x() + dfw1 + dbw1 + 1, @@ -2438,7 +2438,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const } -int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { @@ -2465,7 +2465,7 @@ int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -2483,8 +2483,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, const TQPushButton* button = (const TQPushButton*) widget; int w = contentSize.width(); int h = contentSize.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; w += bm + fw + 6; // ### Add 6 to make way for bold font. h += bm + fw; @@ -2495,7 +2495,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, w = 80; // Compensate for default indicator - int di = pixelMetric( PM_ButtonDefaultIndicator ); + int di = tqpixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; } @@ -2520,8 +2520,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -2571,7 +2571,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, } -// Fix TQt's wacky image alignment +// Fix TQt's wacky image tqalignment 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->repaint( false ); + button->tqrepaint( false ); } else if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->repaint( false ); + button->tqrepaint( 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->alignment() ); + int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() ); if ( hAlign & AlignLeft ) cr.setLeft( cr.left() + m ); if ( hAlign & AlignRight ) cr.setRight( cr.right() - m ); - if ( lb->alignment() & AlignTop ) + if ( lb->tqalignment() & AlignTop ) cr.setTop( cr.top() + m ); - if ( lb->alignment() & AlignBottom ) + if ( lb->tqalignment() & 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->alignment() | ShowPrefix, lb->text() ); + renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } else { - renderViolations(violations, &p, cr,lb->alignment(), lb->text() ); + renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), 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->alignment() & AlignHCenter ) // center alignment + if ( gb->tqalignment() & AlignHCenter ) // center tqalignment x = gb->frameRect().width()/2 - tw/2; - else if ( gb->alignment() & AlignRight ) // right alignment + else if ( gb->tqalignment() & AlignRight ) // right tqalignment x = gb->frameRect().width() - tw - 8; - else if ( gb->alignment() & AlignLeft ) // left alignment + else if ( gb->tqalignment() & AlignLeft ) // left tqalignment x = 8; else { // auto align @@ -2723,7 +2723,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) renderViolations( violations, &paint, r, AlignCenter | ShowPrefix, gb->title() ); - drawItem(&paint, r, AlignCenter | ShowPrefix, gb->colorGroup(), + drawItem(&paint, r, AlignCenter | ShowPrefix, gb->tqcolorGroup(), gb->isEnabled(), 0, stripped_title ); paint.setClipRegion( pevent->region().subtract( r ) ); @@ -2740,7 +2740,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) else { tqdrawPrimitive( TQStyle::PE_GroupBoxFrame, &paint, gb->frameRect(), - gb->colorGroup(), TQStyle::Style_Default, + gb->tqcolorGroup(), TQStyle::Style_Default, TQStyleOption(gb->lineWidth(), gb->midLineWidth(), gb->frameShape(), gb->frameShadow()) ); } diff --git a/scheck/scheck.h b/scheck/scheck.h index 60eb48dd..6a68063d 100644 --- a/scheck/scheck.h +++ b/scheck/scheck.h @@ -95,7 +95,7 @@ class StyleCheckStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -103,13 +103,13 @@ class StyleCheckStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement element, + void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -119,13 +119,13 @@ class StyleCheckStyle : public KStyle SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, diff --git a/scripts/fixheaders b/scripts/fixheaders index b1b0a15b..fd538d5c 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -53,7 +53,7 @@ $lastdir = '.'; 'variable `class QFile \S*\' has initializer but incomplete type' => "qfile", 'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader", '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox", - 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout", + 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout", '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject", '`kdDebug\' undeclared \(first use this function\)' => "kdebug", '`kdWarning\' undeclared \(first use this function\)' => "kdebug", diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el index c63bb5c1..856595e6 100644 --- a/scripts/kde-devel-emacs.el +++ b/scripts/kde-devel-emacs.el @@ -1441,7 +1441,7 @@ With arg, to it arg times." ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb index 62a43aba..8284428b 100644 --- a/scripts/kde-devel-gdb +++ b/scripts/kde-devel-gdb @@ -25,7 +25,7 @@ define printqstringdata set $i=0 set $d = (QStringData *)$arg0 while $i < $d->len - printf "%c", (char)($d->unicode[$i++].ucs & 0xff) + printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff) end printf "\n" end @@ -57,7 +57,7 @@ define printqstring_utf8 set $i=0 set $s = $arg0 while $i < $s.d->len - set $uc = (unsigned short) $s.d->unicode[$i++].ucs + set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs if ( $uc < 0x80 ) printf "%c", (unsigned char)($uc & 0x7f) else diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 581076fa..7b8961fe 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -174,7 +174,7 @@ endfunction function! MapIdentHeader( ident ) " Qt stuff if a:ident =~ 'Q.*Layout' - return '' + return '' elseif a:ident == 'QListViewItem' || \a:ident == 'QCheckListItem' || \a:ident == 'QListViewItemIterator' diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index eaa63a0c..37017413 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-invalidate-state-cache' then would change this local + ;; `c-tqinvalidate-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-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index 01de447a..082f9bbb 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -52,7 +52,7 @@ ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) @@ -217,7 +217,7 @@ (palmtoprecord.h Record) (palmtopuidgen.h UidGen) (password.h Password) - (power.h PowerStatus PowerStatusManager ) + (power.h PowertqStatus PowerStatusManager ) (process.h Process) (qcopenvelope_qws.h QCopEnvelope) (qdawg.h QDawg) diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl index 901fdf12..34ce47a0 100755 --- a/scripts/kde-spellcheck.pl +++ b/scripts/kde-spellcheck.pl @@ -373,7 +373,7 @@ Afganistan Afghanistan agressive aggressive Agressive Aggressive agressively aggressively -alignement alignment +alignement tqalignment alligned aligned Allignment Alignment allmost almost @@ -514,7 +514,7 @@ charakters characters charater character Chatacter Character chatwindow chat window -childs children +childs tqchildren choosed chose choosen chosen Choosen Chosen diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index 17efa128..73951a0f 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 children's environment. We use setenv since it + # Set up the tqchildren'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 3aac8342..2ac38d4e 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 alignment according to the clicked button + // now perform tqalignment 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 alignment you have to select at least 2 objects like classes or actors. You can not align associations."), + i18n("For tqalignment 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 7720b9b3..7e2170a5 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -21,10 +21,10 @@ class TQMainWindow; class UMLWidget; /** - * This toolbar provides tools for alignment. Widgets can only be aligned, when + * This toolbar provides tools for tqalignment. Widgets can only be aligned, when * there are at least 2 widgets (not associations) are selected * - * @short Toolbar providing alignment tools. + * @short Toolbar providing tqalignment 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 alignment. + * Creates a bar with tools for tqalignment. * * @param parentWindow The parent of the toolbar. * @param name The name of the toolbar. @@ -215,7 +215,7 @@ private: private slots: /** - * Performs the alignment when a button was clicked. + * Performs the tqalignment when a button was clicked. * * @param btn The clicked button. */ diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 81a1bb57..6ded541d 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 - // children of the corresponding UML object. + // tqchildren 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 @@ -2101,7 +2101,7 @@ void AssociationWidget::createAssocClassLine() { computeAssocClassLine(); TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine); m_pAssocClassLine->setPen(pen); - m_pAssocClassLine->setVisible(true); + m_pAssocClassLine->tqsetVisible(true); } void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier, diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h index 175a64ec..fbbdf214 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 - * children should make sure that they don't have a menu active or there + * tqchildren 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/_graph.h b/umbrello/umbrello/autolayout/_graph.h index 179a9471..b3c42f30 100644 --- a/umbrello/umbrello/autolayout/_graph.h +++ b/umbrello/umbrello/autolayout/_graph.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTGRAPH_H #define AUTOLAYOUTGRAPH_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 894dddbc..e47911e6 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -12,7 +12,7 @@ #include "autolayoutdlg.h" #include "../associationwidget.h" #include "../umlwidget.h" -#include "autolayout.h" +#include "autotqlayout.h" #include "newautolayoutdialog.h" #include #include @@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b) void AutolayoutDlg::slotSetShapeSeparation(int i) { - shapeSeparation=i; + tqshapeSeparation=i; } void AutolayoutDlg::slotReloadSettings() @@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings() } -void AutolayoutDlg::slotDoAutolayout() +void AutolayoutDlg::slotDoAutotqlayout() { - Autolayout::Autolayouter* a=getAutolayouter();; + Autotqlayout::Autolayouter* a=getAutolayouter();; a->setAssociationAsEdges( associationAsEdges); a->setAssociationWeight( associationWeight ); @@ -115,8 +115,8 @@ void AutolayoutDlg::slotDoAutolayout() a->setGeneralizationWeight( generalizationWeight); a->setNoteConnectionWeight( 1); a->setNoteConnectionsAsEdges(true); - a->setShapeSeparation( shapeSeparation); - a->autolayout( view); + a->setShapeSeparation( tqshapeSeparation); + a->autotqlayout( view); delete a; a=0; accept(); @@ -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))); - shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0))); + tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",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("shapeSeparation",shapeSeparationSB->value()); + conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value()); //conf->writeEntry("al @@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname) } -Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( ) +Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( ) { const TQString text = algorithmCOB->currentText(); - kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl; + kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl; if (text == "dot") - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::DotAutolayouter(); if (text == "circo") - return new Autolayout::CircoAutolayouter(); + return new Autotqlayout::CircoAutolayouter(); if (text == "neato") - return new Autolayout::NeatoAutolayouter(); - kError() << "Autolayout Algorithm not found" << endl; - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::NeatoAutolayouter(); + kError() << "Autotqlayout Algorithm not found" << endl; + return new Autotqlayout::DotAutolayouter(); } diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index 972fd83c..f2614d03 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -16,7 +16,7 @@ #include "../umlview.h" #include #include -#include "autolayout.h" +#include "autotqlayout.h" class AutolayoutDlg : public MyDialog1 { @@ -37,7 +37,7 @@ class AutolayoutDlg : public MyDialog1 virtual void slotSetShapeSeparation(int i); virtual void slotReloadSettings(); virtual void slotSaveSettings(); - virtual void slotDoAutolayout(); + virtual void slotDoAutotqlayout(); void readConfig(KConfig*); void writeConfig(KConfig*); virtual void slotSelectAlgorithm(const TQString&); @@ -54,10 +54,10 @@ class AutolayoutDlg : public MyDialog1 bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; KConfig* config; TQString algname; - Autolayout::Autolayouter* getAutolayouter(); + Autotqlayout::Autolayouter* getAutolayouter(); }; diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp index f70fd195..802bc438 100644 --- a/umbrello/umbrello/autolayout/autolayouter.cpp +++ b/umbrello/umbrello/autolayout/autolayouter.cpp @@ -13,11 +13,11 @@ ***************************************************************************/ #include "autolayouter.h" -namespace Autolayout { +namespace Autotqlayout { -void Autolayouter::autolayout( UMLView * v ) +void Autolayouter::autotqlayout( UMLView * v ) { setCanvas(v); setGraph(v); @@ -25,5 +25,5 @@ void Autolayouter::autolayout( UMLView * v ) updateView(v); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h index a56b1ce3..5d4645f9 100644 --- a/umbrello/umbrello/autolayout/autolayouter.h +++ b/umbrello/umbrello/autolayout/autolayouter.h @@ -13,10 +13,10 @@ #define AUTOLAYOUTAUTOLAYOUTER_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** -This is the super class of any class which encapsulate an autolayout algorithm +This is the super class of any class which encapsulate an autotqlayout algorithm @author Dimitri Ognibene @@ -47,14 +47,14 @@ public: virtual void setShapeSeparation(int i)=0; - virtual void autolayout(UMLView* v); + virtual void autotqlayout(UMLView* v); protected: virtual void run()=0; virtual void updateView(UMLView*)=0; - virtual Autolayout::Canvas* getCanvas()=0; - virtual Autolayout::Graph* getGraph()=0; - virtual Autolayout::Graph* setGraph(UMLView* view)=0; - virtual Autolayout::Canvas* setCanvas(UMLView* view)=0; + virtual Autotqlayout::Canvas* getCanvas()=0; + virtual Autotqlayout::Graph* getGraph()=0; + virtual Autotqlayout::Graph* setGraph(UMLView* view)=0; + virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0; }; diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp index 0673fde1..3a245cbc 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -12,18 +12,18 @@ #include "autolayouteradapter.h" -namespace Autolayout +namespace Autotqlayout { AutolayouterAdapter::AutolayouterAdapter() - : Autolayout::Autolayouter() + : Autotqlayout::Autolayouter() {} AutolayouterAdapter::~AutolayouterAdapter() {}} -void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) +void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) { int weight; switch (a->getAssocType()) @@ -71,60 +71,60 @@ void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight); } -void Autolayout::AutolayouterAdapter::setAssociationWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i ) { associationWeight=i; } -void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i ) { dependenciesWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i ) { generalizationWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) { genralizationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) { dependenciesAsEdges=b; } -void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) { associationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setCompressShapes( bool b ) +void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b ) { compressShapes=b; } -void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b ) +void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b ) { centerDiagram=b; } -void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) +void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) { clusterizeHierarchies=b; } -void Autolayout::AutolayouterAdapter::setShapeSeparation( int i ) +void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i ) { - shapeSeparation=i; + tqshapeSeparation=i; } -Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) +Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view ) { if (! view) return 0; - Autolayout::Graph * g=getGraph(); + Autotqlayout::Graph * g=getGraph(); if (g&&g->empty()) { UMLWidgetList list = view->getWidgetList(); @@ -151,7 +151,7 @@ Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) return g; } -void Autolayout::AutolayouterAdapter::updateView( UMLView* view ) +void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view ) { if (! view) return ; UMLWidgetList list = view->getWidgetList(); @@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList(); } } -Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view ) +Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view ) { - return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); + return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); } -void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i ) { noteConnectionWeight=i; } -void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) { noteConnectionAsEdges=b; } diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 7c52e742..1d05f0d2 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -11,19 +11,19 @@ #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H -//#include "autolayout.h" +//#include "autotqlayout.h" #include "baseinclude.h" #include "autolayouter.h" #include "../umlnamespace.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene */ -class AutolayouterAdapter : virtual public Autolayout::Autolayouter +class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter { public: AutolayouterAdapter(); @@ -70,7 +70,7 @@ protected: bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; int noteConnectionWeight; bool noteConnectionAsEdges; bool anchorsAsEdges; diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h index 246df8a7..210b1353 100644 --- a/umbrello/umbrello/autolayout/canvas.h +++ b/umbrello/umbrello/autolayout/canvas.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTCANVAS_H #define AUTOLAYOUTCANVAS_H -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h index 33bda398..43f35f51 100644 --- a/umbrello/umbrello/autolayout/diagram.h +++ b/umbrello/umbrello/autolayout/diagram.h @@ -16,12 +16,12 @@ #define AUTOLAYOUTABLEDIAGRAM_H #include #define internal_renderizer -#include "autolayout.h" +#include "autotqlayout.h" /** @author Dimitri Ognibene Umbrello UML Modeller Authors */ -namespace Autolayout{ +namespace Autotqlayout{ class Diagram//: public virtual Graph, public virtual Canvas{ { private: @@ -39,7 +39,7 @@ public: void addNode(const char *name, int width,int heigt); void addEdge(const char* nodea,const char*nodeb); - void autolayout(); + void autotqlayout(); void save(); Node getNode(const char*); diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp index 5d197845..dea9b554 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.cpp +++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp @@ -15,10 +15,10 @@ #include -namespace Autolayout { +namespace Autotqlayout { DotAutolayouter::DotAutolayouter() - : Autolayout::GraphvizAutolayouter() + : Autotqlayout::GraphvizAutolayouter() { } @@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter() void DotAutolayouter::run() { //#ifndef internal_renderizer - /* bind graph to GV context - currently must be done before layout */ + /* bind graph to GV context - currently must be done before tqlayout */ // gvBindContext(gvc,g); //#endif - // do layout + // do tqlayout //dot_layout(); dot_layout( gg->_agraph ); } diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h index 5c6530ba..4b8af212 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.h +++ b/umbrello/umbrello/autolayout/dotautolayouter.h @@ -17,12 +17,12 @@ #include "baseinclude.h" #include "graphvizautolayouter.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene */ -class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter +class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter { public: DotAutolayouter(); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp index 8defc5ef..da075642 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp @@ -15,10 +15,10 @@ #include -namespace Autolayout { +namespace Autotqlayout { GraphvizAutolayouter::GraphvizAutolayouter() - : Autolayout::AutolayouterAdapter() + : Autotqlayout::AutolayouterAdapter() { gg = new GraphvizGraph(); } @@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i ) gg->setShapeSeparation(i); } -Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) +Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) { Canvas* canvas= AutolayouterAdapter::setCanvas(view); gg->setCanvas(canvas); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h index 114ae63f..95fa46ba 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.h +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h @@ -15,13 +15,13 @@ #include "autolayouteradapter.h" #include "graphvizgraph.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene */ -class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter +class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter { public: GraphvizAutolayouter(); diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp index 716f9223..a3b4ea8a 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.cpp +++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp @@ -23,7 +23,7 @@ char* _strcpy(const char* name) a=strcpy(a,name); return a; } -namespace Autolayout +namespace Autotqlayout { /** @@ -31,7 +31,7 @@ namespace Autolayout * @return */ GraphvizGraph::GraphvizGraph() - : Autolayout::Graph() + : Autotqlayout::Graph() { aginit(); empty_flag=true; @@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph() a_weight= agedgeattr(_agraph,"weight",""); agnodeattr(_agraph, "fixedsize", "true"); agnodeattr(_agraph, "margin", "0.01,0.01"); - agnodeattr(_agraph, "shape", "box"); + agnodeattr(_agraph, "tqshape", "box"); agraphattr(_agraph, "dpi", "DPI/0"); @@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height) } -void Autolayout::GraphvizGraph::setCompressShapes( bool b ) +void Autotqlayout::GraphvizGraph::setCompressShapes( bool b ) { if (empty()) { @@ -105,7 +105,7 @@ void Autolayout::GraphvizGraph::setCompressShapes( bool b ) } } -void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) +void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b ) { if (empty()) { @@ -114,7 +114,7 @@ void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) } } -void Autolayout::GraphvizGraph::setShapeSeparation( int i ) +void Autotqlayout::GraphvizGraph::setShapeSeparation( int i ) { char* a; asprintf(&a,"%f",((float) i)/10.0); @@ -122,22 +122,22 @@ void Autolayout::GraphvizGraph::setShapeSeparation( int i ) free (a); } -bool Autolayout::GraphvizGraph::empty( ) +bool Autotqlayout::GraphvizGraph::empty( ) { return empty_flag; } -Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 ) +Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 ) { char *a = _strcpy(arg1); - Autolayout::GraphvizNode* b= - new Autolayout::GraphvizNode(agnode(_agraph,a)); + Autotqlayout::GraphvizNode* b= + new Autotqlayout::GraphvizNode(agnode(_agraph,a)); delete[](a); nodelist.push_back(b); return b; } -void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) +void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas) { char buf[100]; sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI)); @@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) agraphattr(_agraph, "page", buf); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h index dfbf323d..1be57139 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.h +++ b/umbrello/umbrello/autolayout/graphvizgraph.h @@ -21,13 +21,13 @@ #include #include -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene */ -class GraphvizGraph : virtual public Autolayout::Graph +class GraphvizGraph : virtual public Autotqlayout::Graph { public: GraphvizGraph(); diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp index ea3510cf..430e176c 100644 --- a/umbrello/umbrello/autolayout/graphviznode.cpp +++ b/umbrello/umbrello/autolayout/graphviznode.cpp @@ -17,7 +17,7 @@ #include #include -namespace Autolayout { +namespace Autotqlayout { @@ -40,7 +40,7 @@ int GraphvizNode::getY() } -Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node ) +Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node ) { n=node; } diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h index 0efcb6d8..1190f5af 100644 --- a/umbrello/umbrello/autolayout/graphviznode.h +++ b/umbrello/umbrello/autolayout/graphviznode.h @@ -18,12 +18,12 @@ class Agnode_t; -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene */ -class GraphvizNode : virtual public Autolayout::Node +class GraphvizNode : virtual public Autotqlayout::Node { GraphvizNode (Agnode_t* n); diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index 7213c164..9301abe3 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -88,12 +88,12 @@ Shape separation - shapeSeparationSB + tqshapeSeparationSB - shapeSeparationSB + tqshapeSeparationSB @@ -203,7 +203,7 @@ Weight - Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence + Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence @@ -258,7 +258,7 @@ Weight - Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence + Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence @@ -313,7 +313,7 @@ Weight - Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence + Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence @@ -330,7 +330,7 @@ Expanding - + 20 1 @@ -339,7 +339,7 @@ - layout9 + tqlayout9 @@ -366,7 +366,7 @@ Expanding - + 277 20 @@ -450,7 +450,7 @@ setEnabled(bool) - shapeSeparationSB + tqshapeSeparationSB valueChanged(int) MyDialog1 slotSetShapeSeparation(int) @@ -513,7 +513,7 @@ buttonOk clicked() MyDialog1 - slotDoAutolayout() + slotDoAutotqlayout() restoreDefaultsBTN @@ -535,7 +535,7 @@ - slotDoAutolayout() + slotDoAutotqlayout() slotSaveSettings() slotReloadSettings() slotSetClusterizeHierarchies(bool b) diff --git a/umbrello/umbrello/autolayout/node.h b/umbrello/umbrello/autolayout/node.h index c2532b8b..74259233 100644 --- a/umbrello/umbrello/autolayout/node.h +++ b/umbrello/umbrello/autolayout/node.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTNODE_H #define AUTOLAYOUTNODE_H -namespace Autolayout { +namespace Autotqlayout { /** @author Umbrello UML Modeller Authors diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp index 0598c15e..38832962 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.cpp +++ b/umbrello/umbrello/autolayout/simplecanvas.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "simplecanvas.h" -namespace Autolayout { +namespace Autotqlayout { diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h index 29712b9e..90cecea5 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.h +++ b/umbrello/umbrello/autolayout/simplecanvas.h @@ -17,7 +17,7 @@ #include "canvas.h" #include -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h index f80f1289..b92b774f 100644 --- a/umbrello/umbrello/classifierwidget.h +++ b/umbrello/umbrello/classifierwidget.h @@ -101,7 +101,7 @@ public: /** * Return the status of showing operation signatures. * - * @return Status of showing operation signatures. + * @return tqStatus of showing operation signatures. */ Uml::Signature_Type getShowOpSigs() const; @@ -173,7 +173,7 @@ public: * Returns whether to show attribute signatures. * Only applies when m_pObject->getBaseType() is ot_Class. * - * @return Status of how attribute signatures are shown. + * @return tqStatus of how attribute signatures are shown. */ Uml::Signature_Type getShowAttSigs() { return m_ShowAttSigs; diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp index 069ba84b..d654e083 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 children of a UMLListViewItem to m_ItemList */ +/** Adds the tqchildren 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 children. + // paste possible tqchildren. 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 children type in clip type 5" << endl; + kWarning() << "pasting unknown tqchildren type in clip type 5" << endl; return false; } } diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h index 017a4beb..b0607ef2 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.h +++ b/umbrello/umbrello/clipboard/umlclipboard.h @@ -167,13 +167,13 @@ private: bool& OnlyAttsOps); /** - * Adds the children of a UMLListViewItem to m_ItemList. + * Adds the tqchildren of a UMLListViewItem to m_ItemList. */ bool insertItemChildren(UMLListViewItem* Item, UMLListViewItemList& SelectedItems); /** - * Inserts the data of the children of the given item + * Inserts the data of the tqchildren 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 children of a UMLListViewItem (The Parent) + * Pastes the tqchildren of a UMLListViewItem (The Parent) */ bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog); diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp index 27f8dde2..543a4b39 100644 --- a/umbrello/umbrello/clipboard/umldrag.cpp +++ b/umbrello/umbrello/clipboard/umldrag.cpp @@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) { data->setSubType(string, index); } -void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) { - data->enc[index] = encodedData.copy(); +void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) { + data->enc[index] = tqencodedData.copy(); } -TQByteArray UMLDrag::encodedData(const char* dataName) const { +TQByteArray UMLDrag::tqencodedData(const char* dataName) const { TQString str(dataName); for (int i = 0; i < 4; i++) { if ( !qstricmp(dataName,data->fmt[i]) ) { @@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip1") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1"); if ( !payload.size() ) { return false; } @@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip2") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2"); if ( !payload.size() ) { return false; } @@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -543,7 +543,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip4") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4"); if ( !payload.size() ) { return false; } @@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip5") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5"); if ( !payload.size() ) { return false; } diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h index fa535399..ad5e4f02 100644 --- a/umbrello/umbrello/clipboard/umldrag.h +++ b/umbrello/umbrello/clipboard/umldrag.h @@ -149,7 +149,7 @@ public: * * @param dataName the name of the data type to return */ - virtual TQByteArray encodedData(const char* dataName) const; + virtual TQByteArray tqencodedData(const char* dataName) const; /** * For use when the user selects only UML Objects diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp index a77e948a..cb571b6b 100644 --- a/umbrello/umbrello/codedocument.cpp +++ b/umbrello/umbrello/codedocument.cpp @@ -281,7 +281,7 @@ void CodeDocument::updateHeader () { headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension()); headingText.replace(TQRegExp("%filepath%"),getPath()); headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + headingText.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); getHeader()->setText(headingText); diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 273018b6..9cac6c3a 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -23,7 +23,7 @@ // qt includes #include #include -#include +#include #include // kde includes @@ -552,7 +552,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) { retstr.replace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else retstr.replace( TQRegExp("%headingpath%"),filename ); retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + retstr.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); // the replace filepath, time parts are also in the code document updateHeader method // (which is not a virtual function)... diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index 8c4f64d0..44a65c62 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include // kde includes #include @@ -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.").arg(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.").tqarg(file.name()),i18n("Cannot Open File")); return false; } return true; diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index c4b36956..ec2bf59a 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "../umldoc.h" #include "../uml.h" diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp index e3e72a38..e973a55e 100644 --- a/umbrello/umbrello/codegenerators/aswriter.cpp +++ b/umbrello/umbrello/codegenerators/aswriter.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include ASWriter::ASWriter() { } diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index dee5c9f4..6ca8377b 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -41,7 +41,7 @@ - layout4 + tqlayout4 @@ -149,7 +149,7 @@ Expanding - + 410 113 @@ -166,7 +166,7 @@ - layout17 + tqlayout17 @@ -223,7 +223,7 @@ 0 - + 32 32767 @@ -285,7 +285,7 @@ Minimum - + 20 20 @@ -302,7 +302,7 @@ Minimum - + 20 20 @@ -430,7 +430,7 @@ 0 - + 32 32767 diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp index 5517d2f3..d58ceae4 100644 --- a/umbrello/umbrello/codegenerators/cppwriter.cpp +++ b/umbrello/umbrello/codegenerators/cppwriter.cpp @@ -20,7 +20,7 @@ #include "cppwriter.h" // qt/kde includes #include -#include +#include #include #include // app includes @@ -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.at(0).upper()); + methodBaseName.replace(0,1,methodBaseName.tqat(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 167ccb12..180ba176 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "../uml.h" #include "../umldoc.h" @@ -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").arg(m_unnamedRoles++); + roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++); } TQString roleDoc = a->getRoleDoc(Uml::B); diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp index fdcc63b6..088ab9c1 100644 --- a/umbrello/umbrello/codegenerators/dwriter.cpp +++ b/umbrello/umbrello/codegenerators/dwriter.cpp @@ -20,7 +20,7 @@ #include "dwriter.h" // qt includes #include -#include +#include #include // kde includes #include diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp index 675982ca..efb49dc9 100644 --- a/umbrello/umbrello/codegenerators/idlwriter.cpp +++ b/umbrello/umbrello/codegenerators/idlwriter.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "../umldoc.h" #include "../classifier.h" diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index 426c6d9a..1587c265 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start java classifier document diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui index 60764673..a9ba6a89 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui @@ -18,7 +18,7 @@ - layout6 + tqlayout6 @@ -74,7 +74,7 @@ - layout2 + tqlayout2 @@ -117,7 +117,7 @@ - layout4 + tqlayout4 @@ -163,7 +163,7 @@ - layout4 + tqlayout4 diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index a1e4d0b3..19f3c1fd 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -21,7 +21,7 @@ #include "javawriter.h" // qt includes #include -#include +#include #include // kde includes #include @@ -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.at(0).upper()); + fieldName.replace(0,1,fieldName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), cleanName(at->getName()), diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp index 9d58cf3d..ea4cc2e1 100644 --- a/umbrello/umbrello/codegenerators/jswriter.cpp +++ b/umbrello/umbrello/codegenerators/jswriter.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include JSWriter::JSWriter() { } diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp index 9e75c6d6..0f3c32ef 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.cpp +++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "../umldoc.h" #include "../uml.h" diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp index def1c7dd..9d51ffde 100644 --- a/umbrello/umbrello/codegenerators/perlwriter.cpp +++ b/umbrello/umbrello/codegenerators/perlwriter.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include PerlWriter::PerlWriter() { @@ -168,8 +168,8 @@ void PerlWriter::writeClass(UMLClassifier *c) { if(!str.isEmpty()) { str.replace(TQRegExp("%filename%"),fileName); str.replace(TQRegExp("%filepath%"),fileperl.name()); - str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy")); - str.replace(TQRegExp("%date%"),TQDate::currentDate().toString()); + str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy")); + str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString()); str.replace(TQRegExp("%time%"),TQTime::currentTime().toString()); str.replace(TQRegExp("%package-name%"),ThisPkgName); if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){ diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index c222e3c9..f0de28a3 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../umldoc.h" #include "../classifier.h" @@ -173,7 +173,7 @@ static const char *php5words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -760,8 +760,8 @@ static const char *php5words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -2704,7 +2704,7 @@ static const char *php5words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2738,21 +2738,21 @@ static const char *php5words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index e589b661..f7e1e76e 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include "../umldoc.h" #include "../classifier.h" @@ -171,7 +171,7 @@ static const char *words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -758,8 +758,8 @@ static const char *words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -2700,7 +2700,7 @@ static const char *words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2734,21 +2734,21 @@ static const char *words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp index c89da92e..8c913022 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.cpp +++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "../umldoc.h" @@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const { << "TypeError" << "UnboundLocalError" << "unichr" - << "unicode" + << "tqunicode" << "UnicodeError" << "UserWarning" << "ValueError" diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ada4b0bb..22fa56fc 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start ruby classifier document diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui index 28f74fd0..c47dc97f 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui @@ -18,7 +18,7 @@ - layout6 + tqlayout6 @@ -45,7 +45,7 @@ - layout2 + tqlayout2 @@ -88,7 +88,7 @@ - layout4 + tqlayout4 @@ -134,7 +134,7 @@ - layout4 + tqlayout4 diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index 64302a80..e736641f 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "classifierinfo.h" diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp index 55717ea0..8582ec93 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.cpp +++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "../classifier.h" diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp index c0c42ad6..6d40b4b0 100644 --- a/umbrello/umbrello/codegenerators/tclwriter.cpp +++ b/umbrello/umbrello/codegenerators/tclwriter.cpp @@ -18,7 +18,7 @@ #include "tclwriter.h" // qt/kde includes #include -#include +#include #include #include // app includes diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp index bff55304..f2bf7a66 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "../umldoc.h" @@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc } } -// all that matters here is roleA, the role served by the children of this class +// all that matters here is roleA, the role served by the tqchildren 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 cb5546d8..cc4372a2 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 children. + * inheriting tqchildren. */ void writeGroupClassifierDecl(UMLClassifier *c, UMLClassifierList superclassifiers, diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp index c3fb2fd6..0c689e1e 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 children at all + // or its tqchildren 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 children +// by some other class that is concrete and takes tqchildren // derived from codeblock/codecomment void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root) { diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h index 7bf338f2..b8f50454 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 children + * by some other class that is concrete and takes tqchildren * 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 e32758dd..469e4030 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"). - arg(fileName).arg(processedFilesCount).arg(fileList.size())); + tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size())); parseFile(fileName); processedFilesCount++; } diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 6b87f493..4e38a1aa 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?").arg(scopeName), + i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName), i18n("C++ Import Requests Your Help"), i18n("Namespace"), i18n("Class")); } diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp index 0b90d5a0..7f62a1a9 100644 --- a/umbrello/umbrello/codeimport/javaimport.cpp +++ b/umbrello/umbrello/codeimport/javaimport.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index 2c962e5d..ebb10af4 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_children.setAutoDelete( false ); + m_tqchildren.setAutoDelete( false ); #endif } @@ -188,12 +188,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_children.append( child ); + m_tqchildren.append( child ); } void AST::removeChild( AST* child ) { - m_children.remove( child ); + m_tqchildren.remove( child ); } #endif @@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); + str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >"); return str; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index 3c96da9e..49520e33 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 children() { return m_children; } + TQPtrList tqchildren() { return m_tqchildren; } 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_children; + TQPtrList m_tqchildren; #endif TQString m_comment; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 44c10f82..ee6937ac 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 children = node->children(); - TQPtrListIterator it( children ); + TQPtrList tqchildren = node->tqchildren(); + TQPtrListIterator it( tqchildren ); while( it.current() ){ AST* a = it.current(); ++it; @@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_ClassSpecifier: if( ((ClassSpecifierAST*)ast)->name() ){ s = ((ClassSpecifierAST*)ast)->name()->text(); - s = s.isEmpty() ? TQString::fromLatin1("") : s; + s = s.isEmpty() ? TQString::tqfromLatin1("") : s; scope.push_back( s ); } break; @@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ((NamespaceAST*)ast)->namespaceName(); - s = namespaceName ? namespaceName->text() : TQString::fromLatin1(""); + s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1(""); scope.push_back( s ); } break; @@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += scope; if( declarator->subDeclarator() ) - text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")"); + text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")"); if( declarator->declaratorId() ) text += declarator->declaratorId()->text(); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index eb3c4b6a..f91813f1 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].unicode(); + int c = s[i+1].tqunicode(); switch( c ) { case '0': return 0; @@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].unicode(); + return s[i].tqunicode(); } } else { return 0; @@ -374,21 +374,21 @@ 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'").arg(ide), m_currentLine, m_currentColumn ); + //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") ); + textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); textToInsert.append( str ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str + TQString::fromLatin1(" ") ); + textToInsert.append( str + TQString::tqfromLatin1(" ") ); } } @@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else { - tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 ); + tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 ); nextChar(); tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); @@ -808,7 +808,7 @@ int Lexer::macroPrimary() { readWhiteSpaces( false ); int result = 0; - switch( currentChar().unicode() ) { + switch( currentChar().tqunicode() ) { case '(': nextChar(); result = macroExpression(); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index 2d009294..a05a7ddf 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table, const HashEntry* Lookup::findEntry( const struct HashTable *table, const TQString &s ) { - return findEntry( table, s.unicode(), s.length() ); + return findEntry( table, s.tqunicode(), s.length() ); } int Lookup::find(const struct HashTable *table, @@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table, int Lookup::find(const struct HashTable *table, const TQString &s) { - return find(table, s.unicode(), s.length()); + return find(table, s.tqunicode(), s.length()); } unsigned int Lookup::hash(const TQChar *c, unsigned int len) @@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len) unsigned int Lookup::hash(const TQString &key) { - return hash(key.unicode(), key.length()); + return hash(key.tqunicode(), key.length()); } unsigned int Lookup::hash(const char *s) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index b724faba..51837b1e 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'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(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'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(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.arg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); } return true; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index 3e6dde46..8b8cc8eb 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str ) if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); if (ret) { diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp index 5005bd1e..b2f7dac3 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.cpp +++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp index d6092915..0e114082 100644 --- a/umbrello/umbrello/dialog_utils.cpp +++ b/umbrello/umbrello/dialog_utils.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include @@ -25,15 +25,15 @@ namespace Dialog_Utils { -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, const TQString& editFieldText /* = TQString() */) { label = new TQLabel(labelText, containingBox); - layout->addWidget(label, row, 0); + tqlayout->addWidget(label, row, 0); editField = new TQLineEdit(editFieldText, containingBox); - layout->addWidget(editField, row, 1 ); + tqlayout->addWidget(editField, row, 1 ); label->setBuddy(editField); return editField; } diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h index 59925d3e..5588049e 100644 --- a/umbrello/umbrello/dialog_utils.h +++ b/umbrello/umbrello/dialog_utils.h @@ -31,7 +31,7 @@ namespace Dialog_Utils { * Create a labeled text lineedit widget. * * @param containingBox The containing TQGroupBox. - * @param layout The TQGridLayout to use. + * @param tqlayout The TQGridLayout to use. * @param row The row number within the TQGridLayout. * @param label The TQLabel object allocated (return value) * @param labelText The label text. @@ -39,7 +39,7 @@ namespace Dialog_Utils { * @param editFieldText Initialization text in the editField (optional.) * @return a pointer to the TQLineEdit so you can setFocus() if necessary */ -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, const TQString& editFieldText = TQString()); diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp index 6449bd50..ed7f779e 100644 --- a/umbrello/umbrello/dialogs/activitydialog.cpp +++ b/umbrello/umbrello/dialogs/activitydialog.cpp @@ -13,7 +13,7 @@ #include "activitydialog.h" //qt includes -#include +#include //kde includes #include diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 5b604d1d..10ccb04b 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include ActivityPage::ActivityPage( TQWidget * pParent, StateWidget * pWidget ) : TQWidget( pParent ) { @@ -37,7 +37,7 @@ void ActivityPage::setupPage() { m_pActivityGB = new TQGroupBox(i18n("Activities"), this ); - // vertical box layout for the activity lists, arrow buttons and the button box + // vertical box tqlayout for the activity lists, arrow buttons and the button box TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB ); listVBoxLayout -> setMargin(margin); listVBoxLayout -> setSpacing ( 10 ); diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp index 089a8427..b093cae0 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.cpp +++ b/umbrello/umbrello/dialogs/assocgenpage.cpp @@ -13,7 +13,7 @@ #include "assocgenpage.h" // qt includes -#include +#include #include // kde includes diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index 67ff8cd1..ec95f619 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "assocpage.h" -#include +#include #include #include "assocpropdlg.h" @@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa m_pAssocGB = new TQGroupBox(i18n("Associations"), this); mainLayout -> addWidget(m_pAssocGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pAssocLB = new TQListBox(m_pAssocGB); - layout -> addWidget(m_pAssocLB); + tqlayout -> addWidget(m_pAssocLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 32bedb48..1d5b9c77 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -13,7 +13,7 @@ #include "assocpropdlg.h" // qt/kde includes -#include +#include #include #include diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp index 1d884bad..a44a5f05 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.cpp +++ b/umbrello/umbrello/dialogs/assocrolepage.cpp @@ -13,7 +13,7 @@ #include "assocrolepage.h" // qt includes -#include +#include // kde includes #include @@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() { // m_pDocB-> setEnabled(false); m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth); - // add group boxes to main layout + // add group boxes to main tqlayout mainLayout -> addWidget( propsAGB, 0, 0); mainLayout -> addWidget( scopeABG, 1, 0); mainLayout -> addWidget(changeABG, 2, 0); diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index a21018a2..d633b6ae 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -13,7 +13,7 @@ #include "classgenpage.h" // qt includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index 16039a79..a96cb645 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace Uml; @@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi int margin = fontMetrics().height(); setMinimumSize(310,330); - //main layout contains our two group boxes, the list and the documentation + //main tqlayout contains our two group boxes, the list and the documentation TQVBoxLayout* mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing(10); - //top group box, contains a vertical layout with list box above and buttons below + //top group box, contains a vertical tqlayout with list box above and buttons below m_pItemListGB = new TQGroupBox(typeName, this ); TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB ); listVBoxLayout->setMargin(margin); diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h index fb3527b2..2675fd35 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.h +++ b/umbrello/umbrello/dialogs/classifierlistpage.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include //kde includes #include diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp index 87e8430c..670d86f1 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.cpp +++ b/umbrello/umbrello/dialogs/classoptionspage.cpp @@ -13,7 +13,7 @@ #include "classoptionspage.h" // qt/kde includes -#include +#include #include #include diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h index 718944cc..e9c81525 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 - * children. This is not normally called by you. It is used by + * tqchildren. 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/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index e1da407f..169de20e 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -13,7 +13,7 @@ #include "classpropdlg.h" // qt/kde includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 432bf941..33fb743b 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h index a1186223..d5c42d1f 100644 --- a/umbrello/umbrello/dialogs/codeeditor.h +++ b/umbrello/umbrello/dialogs/codeeditor.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "../codeviewerstate.h" #include "../textblocklist.h" diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index 0adc90c3..601b5385 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -55,7 +55,7 @@ - layout1 + tqlayout1 @@ -163,7 +163,7 @@ Fixed - + 30 20 @@ -180,7 +180,7 @@ Fixed - + 30 20 @@ -270,7 +270,7 @@ generator wants to use as output file already exists: - layout8 + tqlayout8 @@ -297,7 +297,7 @@ generator wants to use as output file already exists: Expanding - + 16 30 @@ -314,7 +314,7 @@ generator wants to use as output file already exists: Expanding - + 16 30 @@ -331,7 +331,7 @@ generator wants to use as output file already exists: Expanding - + 16 30 diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index b64e30dc..30ab5817 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?").arg(info.filePath()), + i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(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.").arg(info.filePath()), + KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()), i18n("Please Choose Valid Folder")); return; } diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index fdd59c2c..517df16e 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -88,7 +88,7 @@ for in the right hand side list Expanding - + 20 20 @@ -146,7 +146,7 @@ for in the right hand side list Fixed - + 20 20 @@ -190,7 +190,7 @@ for in the right hand side list Expanding - + 20 20 @@ -206,7 +206,7 @@ for in the right hand side list status - Code Generation Status + Code Generation tqStatus @@ -231,7 +231,7 @@ for in the right hand side list GroupBox2 - Generation Status + Generation tqStatus @@ -257,7 +257,7 @@ for in the right hand side list - Generation Status + Generation tqStatus true diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 054f84d7..3f11adb3 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -19,7 +19,7 @@ #include "codeviewerdialog.h" // qt/kde includes -#include +#include #include #include #include @@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) { CodeViewerDialogBaseLayout->setMargin(margin); - resize( TQSize(width, height).expandedTo(minimumSizeHint()) ); + resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) ); } diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h index d8774674..eef90445 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.h +++ b/umbrello/umbrello/dialogs/codeviewerdialog.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "../codeviewerstate.h" #include "codeviewerdialogbase.h" diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index 1a283200..665d6ccf 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -29,7 +29,7 @@ - layout2 + tqlayout2 diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 346dc44d..ed75ea9d 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -31,7 +31,7 @@ - colorGroupBox + tqcolorGroupBox @@ -161,7 +161,7 @@ - layout4 + tqlayout4 @@ -192,7 +192,7 @@ - layout3 + tqlayout3 diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 0301ca18..34176e3a 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -13,7 +13,7 @@ #include "diagramprintpage.h" // qt/kde includes -#include +#include #include #include #include @@ -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").arg(count); - TQString sID = TQString("%1").arg(ID2STR(view -> getID())); + TQString sCount = TQString("%1").tqarg(count); + TQString sID = TQString("%1").tqarg(ID2STR(view -> getID())); opts.insert(diagram + sCount, sID); count++; } } - opts.insert("kde-uml-count", TQString("%1").arg(count)); + opts.insert("kde-uml-count", TQString("%1").tqarg(count)); } void DiagramPrintPage::setOptions( const TQMap& /*opts*/ ) {} diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui index c7e430cb..8dc7f029 100644 --- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui +++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui @@ -70,7 +70,7 @@ - layout20 + tqlayout20 @@ -78,7 +78,7 @@ - layout6 + tqlayout6 @@ -131,7 +131,7 @@ Expanding - + 50 20 @@ -164,7 +164,7 @@ - layout7 + tqlayout7 @@ -172,7 +172,7 @@ - layout6 + tqlayout6 @@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on Expanding - + 20 20 @@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on - layout8 + tqlayout8 @@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on Expanding - + 20 20 @@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on - layout10 + tqlayout10 @@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on Expanding - + 20 20 diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index 4ec2b30c..443ad9e2 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -13,7 +13,7 @@ #include "exportallviewsdialog.h" // include files for TQt -#include +#include #include #include @@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog( : ExportAllViewsDialogBase(parent,name, modal,fl) { // create and initialize m_imageType m_imageType = new KFileFilterCombo(this, "m_imageType"); - m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); + m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); m_imageType->setEditable(false); m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType); diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui index 4a7edb52..e795d2c9 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui +++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui @@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie Expanding - + 20 16 @@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie Expanding - + 20 20 diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp index ab823a4b..effb585d 100644 --- a/umbrello/umbrello/dialogs/notedialog.cpp +++ b/umbrello/umbrello/dialogs/notedialog.cpp @@ -15,8 +15,8 @@ // qt/kde includes #include #include -#include -#include +#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index d2baa69e..9088b794 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include @@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue( bool applyToAllRemaining, TQWidget* parent, const char* name) : KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) { - TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); + 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.").arg(fileName).arg(outputDirectory), plainPage() ); - layout->addWidget(dialogueLabel); + 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() ); + tqlayout->addWidget(dialogueLabel); m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() ); m_applyToAllRemaining->setChecked(applyToAllRemaining); - layout->addWidget(m_applyToAllRemaining); + tqlayout->addWidget(m_applyToAllRemaining); setButtonText(KDialogBase::Ok, i18n("&Overwrite")); setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name")); diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp index c0f161dc..38a75292 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.cpp +++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp @@ -13,7 +13,7 @@ #include "parmpropdlg.h" // qt includes -#include +#include #include // kde includes diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h index 851eedae..0164277d 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.h +++ b/umbrello/umbrello/dialogs/parmpropdlg.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index 172fc0cd..a5b742b1 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "pkgcontentspage.h" -#include +#include #include #include "../umlobjectlist.h" #include "../uml.h" @@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) m_pContentGB = new TQGroupBox(i18n("Contained Items"), this); mainLayout -> addWidget(m_pContentGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pContentLB = new TQListBox(m_pContentGB); - layout -> addWidget(m_pContentLB); + tqlayout -> addWidget(m_pContentLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index d4694afb..1c175752 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -13,7 +13,7 @@ #include "selectopdlg.h" // qt includes -#include +#include // kde includes #include diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index f4827ac8..b5cddff5 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -13,7 +13,7 @@ #include "settingsdlg.h" // qt includes -#include +#include #include #include // kde includes diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index 1d3288d7..564146ec 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -13,7 +13,7 @@ #include "statedialog.h" //qt includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index c46e2af6..d6ea57ce 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -13,7 +13,7 @@ #include "umlattributedialog.h" // qt includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index d00718b6..55a47857 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -13,7 +13,7 @@ #include "umlentityattributedialog.h" // qt includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index c177a01b..e8216b99 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -13,7 +13,7 @@ #include "umloperationdialog.h" //qt includes -#include +#include #include #include #include @@ -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")).arg(classifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(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/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp index e66c841f..607ac759 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.cpp +++ b/umbrello/umbrello/dialogs/umlroledialog.cpp @@ -13,7 +13,7 @@ #include "umlroledialog.h" // qt/kde includes -#include +#include #include #include @@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() { m_pRoleProps = new UMLRoleProperties(this, m_pRole); setMainWidget( m_pRoleProps ); - resize( TQSize(425, 620).expandedTo(minimumSizeHint()) ); + resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) ); // topLayout -> addWidget( m_pParmsGB); diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp index 998a6311..fe2e2f5f 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.cpp +++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui index dde405a5..ecaa98ae 100644 --- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui +++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui @@ -14,7 +14,7 @@ - layout6 + tqlayout6 @@ -37,7 +37,7 @@ - layout5 + tqlayout5 @@ -111,7 +111,7 @@ - layout2 + tqlayout2 diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp index de8af77c..6075fbe4 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp +++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp @@ -13,7 +13,7 @@ #include "umltemplatedialog.h" // qt includes -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 586f729d..33a6a21f 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -14,12 +14,12 @@ // qt/kde includes #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index ca84bf7d..824d708f 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -14,7 +14,7 @@ #include "../umlview.h" #include "../umlwidget.h" #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 266dd12f..e577a6c3 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "uml.h" #include "umldoc.h" @@ -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").arg(tmpfile.name()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error")); return false; } umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index c00e9c5d..a0555188 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "uml.h" #include "umldoc.h" diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp index d2900533..ab935d00 100644 --- a/umbrello/umbrello/docwindow.cpp +++ b/umbrello/umbrello/docwindow.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp index 94c5ec21..700f9de4 100644 --- a/umbrello/umbrello/floatingtextwidget.cpp +++ b/umbrello/umbrello/floatingtextwidget.cpp @@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText) setText( newText ); UMLApp::app()->getDocument()->setModified(true); } - setVisible( true ); + tqsetVisible( true ); updateComponentSize(); update(); } @@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() { if(ok && newText != getText() && isTextValid(newText)) { setText( newText ); - setVisible( ( getText().length() > 0 ) ); + tqsetVisible( ( getText().length() > 0 ) ); updateComponentSize(); update(); } @@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() { opText = selectDlg.getOpText(); if (selectDlg.isClassOp()) { Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c); if (st == Model_Utils::PS_OK) { UMLClassifierList selfAndAncestors = c->findSuperClassConcepts(); selfAndAncestors.prepend(c); @@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) { void FloatingTextWidget::setMessageText() { if (m_pLink) m_pLink->setMessageText(this); - setVisible(getText().length() > 0); + tqsetVisible(getText().length() > 0); updateComponentSize(); } diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index 1c608d8f..127c3b34 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.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error")); return false; } if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error")); return false; } TQTextStream stream(&file); diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index 70b98b6c..3968e72a 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -14,7 +14,7 @@ // qt includes #include -#include +#include #include #include #include diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 95007d73..c5efcb65 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -74,7 +74,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); m_frame -> setLineWidth (2); m_slider = new KPlayerSlider (Qt::Vertical, m_frame); - m_frame -> resize (36, m_slider -> sizeHint().height() + 4); + m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); //CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot); @@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider() //CHANGED kdDebug() << "KPlayerSlider destroyed\n"; } -TQSize KPlayerSlider::sizeHint() const +TQSize KPlayerSlider::tqsizeHint() const { - TQSize hint = TQSlider::sizeHint(); + TQSize hint = TQSlider::tqsizeHint(); //CHANGED int length = kPlayerSettings() -> preferredSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) @@ -296,10 +296,10 @@ TQSize KPlayerSlider::sizeHint() const return hint; } -TQSize KPlayerSlider::minimumSizeHint() const +TQSize KPlayerSlider::tqminimumSizeHint() const { //kdDebug() << "KPlayerSlider minimum size hint\n"; - TQSize hint = TQSlider::minimumSizeHint(); + TQSize hint = TQSlider::tqminimumSizeHint(); //CHANGED int length = kPlayerSettings() -> minimumSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 14866991..8c0b11ef 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -38,10 +38,10 @@ public: /** The size hint. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** The minimum size hint. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** The minimum value. */ diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp index df3f614d..2d23021d 100644 --- a/umbrello/umbrello/linepath.cpp +++ b/umbrello/umbrello/linepath.cpp @@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setZ( -2 ); line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( 1, line ); if (!bLoading) setupSelected(); @@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); if (!bLoading) setupSelected(); @@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( pointIndex, line ); if (!bLoading) setupSelected(); @@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) { line -> setPoints( start.x(), start.y(), end.x(), end.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); return true; } @@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) { TQCanvasLine * line = new TQCanvasLine( getCanvas() ); line -> setZ( 0 ); line -> setPen( pen ); - line -> setVisible( true ); + line -> tqsetVisible( true ); list.append( line ); } } @@ -665,7 +665,7 @@ void LinePath::createHeadLines() { case Uml::at_Realization: growList(m_HeadList, 3); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); + m_pClearPoly -> tqsetVisible( true ); m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); m_pClearPoly -> setZ( -1 ); break; @@ -674,7 +674,7 @@ void LinePath::createHeadLines() { case Uml::at_Aggregation: growList(m_HeadList, 4); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); + m_pClearPoly -> tqsetVisible( true ); if( getAssocType() == Uml::at_Aggregation ) m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); else diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index f3227c31..6f2eea21 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -64,7 +64,7 @@ void MessageWidget::init() { m_pOw[Uml::A] = m_pOw[Uml::B] = NULL; m_pFText = NULL; m_nY = 0; - setVisible(true); + tqsetVisible(true); } MessageWidget::~MessageWidget() { @@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() { setMessageText(m_pFText); calculateDimensions(); - setVisible(true); + tqsetVisible(true); setX(m_nPosX); setY(m_nY); @@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { m_pFText -> setText(""); m_pFText->setActivated(); TQString messageText = m_pFText->getText(); - m_pFText->setVisible( messageText.length() > 1 ); + m_pFText->tqsetVisible( messageText.length() > 1 ); connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h index db24fd36..9d36922b 100644 --- a/umbrello/umbrello/messagewidget.h +++ b/umbrello/umbrello/messagewidget.h @@ -209,7 +209,7 @@ public: UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op); /** - * Calculate the geometry of the widget. + * Calculate the tqgeometry of the widget. */ void calculateWidget(); diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index 1c7a1add..4131d9b1 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) { return dirLen; } -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -430,7 +430,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS return PS_OK; } -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis /* = 0 */) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -494,7 +494,7 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning return PS_OK; } -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); m = m.simplifyWhiteSpace(); @@ -546,7 +546,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist); for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) { NameAndType nmTp; - Parse_Status ps = parseAttribute(*lit, nmTp, owningScope); + Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope); if (ps) return ps; desc.m_args.append(nmTp); @@ -554,7 +554,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin return PS_OK; } -TQString psText(Parse_Status value) { +TQString psText(Parse_tqStatus value) { const TQString text[] = { i18n("OK"), i18n("Empty"), i18n("Malformed argument"), i18n("Unknown argument type"), i18n("Illegal method name"), diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h index 1e8bd83b..6660ff64 100644 --- a/umbrello/umbrello/model_utils.h +++ b/umbrello/umbrello/model_utils.h @@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str); /** * Return type of parseOperation() */ -enum Parse_Status { +enum Parse_tqStatus { PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType, PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error }; @@ -284,7 +284,7 @@ struct OpDescriptor { * @param owningScope Pointer to the owning scope of the template param. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); /** * Parses an attribute given in UML syntax. @@ -303,7 +303,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS * * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis = 0); /** @@ -316,12 +316,12 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning * @param owningScope Pointer to the owning scope of the operation. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); /** - * Returns the Parse_Status as a text. + * Returns the Parse_tqStatus as a text. */ -TQString psText(Parse_Status value); +TQString psText(Parse_tqStatus value); } diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index c23425d1..1826847b 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -14,7 +14,7 @@ //qt includes #include #include -#include +#include #include // kde includes #include @@ -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->repaint(); + m_pEditor->tqrepaint(); #else if (p == NULL) return; diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h index 081556ed..7c3da48c 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 geometry of the editor. + * Executes base code and then sets the tqgeometry of the editor. * * @param me The TQMouseEvent event. */ diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 193f9545..1986cfa3 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")).arg(newClassifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(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")).arg(newClassifier->getName()) + // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(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/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp index 9b992398..18d70a68 100644 --- a/umbrello/umbrello/seqlinewidget.cpp +++ b/umbrello/umbrello/seqlinewidget.cpp @@ -28,7 +28,7 @@ SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanv m_pObject = pObject; setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) ); setZ( 0 ); - setVisible( true ); + tqsetVisible( true ); m_DestructionBox.line1 = 0; m_nLengthY = 250; setupDestructionBox(); @@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() { m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() ); m_DestructionBox.setLine1Points(rect); - m_DestructionBox.line1->setVisible( true ); + m_DestructionBox.line1->tqsetVisible( true ); m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line1->setZ( 3 ); m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() ); m_DestructionBox.setLine2Points(rect); - m_DestructionBox.line2->setVisible( true ); + m_DestructionBox.line2->tqsetVisible( true ); m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line2->setZ( 3 ); } diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp index cbcbc20f..05e98734 100644 --- a/umbrello/umbrello/toolbarstatearrow.cpp +++ b/umbrello/umbrello/toolbarstatearrow.cpp @@ -58,7 +58,7 @@ void ToolBarStateArrow::mousePressEmpty() { line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine)); - line->setVisible(true); + line->tqsetVisible(true); line->setZ(100); m_selectionRect.append(line); } diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp index 005e5def..340a28dc 100644 --- a/umbrello/umbrello/toolbarstateassociation.cpp +++ b/umbrello/umbrello/toolbarstateassociation.cpp @@ -132,7 +132,7 @@ void ToolBarStateAssociation::setFirstWidget() { m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y()); m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_associationLine->setVisible(true); + m_associationLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp index f8e5930a..453c6d7c 100644 --- a/umbrello/umbrello/toolbarstatemessages.cpp +++ b/umbrello/umbrello/toolbarstatemessages.cpp @@ -118,7 +118,7 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) { m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_messageLine->setVisible(true); + m_messageLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 8f991962..8a305952 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -13,7 +13,7 @@ #include "uml.h" // qt includes -#include +#include #include #include #include @@ -55,7 +55,7 @@ #include "umlviewlist.h" #include "worktoolbar.h" #ifdef HAVE_DOT -# include "autolayout/autolayoutdlg.h" //dimitri +# include "autotqlayout/autolayoutdlg.h" //dimitri #endif #include "model_utils.h" #include "clipboard/umlclipboard.h" @@ -225,8 +225,8 @@ void UMLApp::initActions() { TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()), - actionCollection(),"autolayout"); + autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()), + actionCollection(),"autotqlayout"); #endif sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); @@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() { void UMLApp::initStatusBar() { m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() ); - m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() ); + m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() ); m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); m_statusLabel->setMargin( 0 ); @@ -382,7 +382,7 @@ void UMLApp::initStatusBar() { statusBar()->addWidget( m_statusLabel, 1, false ); - m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); + m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); } @@ -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?").arg(url.path()), i18n("Warning"), i18n("Overwrite")); + int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(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").arg(m_doc->URL().prettyURL()))) { + if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) { m_doc -> print(&printer); } @@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() { void UMLApp::slotEditPaste() { slotStatusMsg(i18n("Inserting clipboard contents...")); - TQMimeSource* data = TQApplication::clipboard()->data(); + TQMimeSource* data = TQApplication::tqclipboard()->data(); UMLClipboard clipboard; setCursor(KCursor::waitCursor()); if(!clipboard.paste(data)) { @@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); m_statusLabel->setText( text ); - m_statusLabel->repaint(); + m_statusLabel->tqrepaint(); } void UMLApp::slotClassDiagram() { @@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { - TQClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted @@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) { } void UMLApp::slotClipDataChanged() { - TQMimeSource * data = TQApplication::clipboard()->data(); + TQMimeSource * data = TQApplication::tqclipboard()->data(); //Pass the MimeSource to the Doc editPaste->setEnabled( data && canDecode(data) ); @@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { TQMimeSource * clipdata = 0; if ((clipdata = clipboard.copy(bFromView)) != 0) { - TQClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); return true; @@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() { //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 ); } -void UMLApp::slotAutolayout(){ +void UMLApp::slotAutotqlayout(){ #ifdef HAVE_DOT /* TQDialog* d = new AutolayoutDlg(getCurrentView()); diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index f8e1be48..3e5b27e7 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 geometry and the recent file list to + * as well as the tqgeometry and the recent file list to * the configuration file. */ void saveOptions(); @@ -535,7 +535,7 @@ public slots: /** * Autolayouts the current class diagram */ - void slotAutolayout(); + void slotAutotqlayout(); /** * Changes the statusbar contents for the standard label @@ -959,7 +959,7 @@ private: KAction* deleteSelectedWidget; KAction* deleteDiagram; #ifdef HAVE_DOT - KAction* autolayout; + KAction* autotqlayout; #endif KAction* changeTabLeft; diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index edf56b23..39c8ce61 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.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(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.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(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.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(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.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(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").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(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.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(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").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(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").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(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").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(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?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { removeView(umlview); emit sigDiagramRemoved(id); setModified(true); @@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { TQDomElement root = doc.createElement( "XMI" ); root.setAttribute( "xmi.version", "1.2" ); - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); root.setAttribute( "timestamp", now.toString(Qt::ISODate)); root.setAttribute( "verified", "false"); root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3"); @@ -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").arg(i); + TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(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").arg(".xmi") ); + tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".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 5db7d670..6fe7b84f 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -86,7 +86,7 @@ protected: return; UMLOperation *op = static_cast(obj); TQString text = op->toString(Uml::st_ShowSig); - TQRect rect = lv->itemRect(item); + TQRect rect = lv->tqitemRect(item); tip(rect, text); } }; @@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) { file.close(); } else { KMessageBox::error(0, - i18n("There was a problem saving file: %1").arg(fileName), + i18n("There was a problem saving file: %1").tqarg(fileName), i18n("Save Error")); return; } @@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) { clearSelection(); triggerUpdate(); } - //repaint(); + //tqrepaint(); TQListView::focusOutEvent(fe); } @@ -2111,7 +2111,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type } else if ( type == Uml::ot_Template ) { UMLClassifier *owningClassifier = static_cast(parent); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -2127,7 +2127,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type UMLClassifier *owningClass = static_cast(parent); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; + Model_Utils::Parse_tqStatus st; st = Model_Utils::parseAttribute(text, nt, owningClass, &vis); if (st) { KMessageBox::error( kapp->mainWidget(), @@ -2143,7 +2143,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type } else if ( type == Uml::ot_Operation ) { UMLClassifier *owningClassifier = static_cast(parent); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -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 children although new + // The clip still contains the old tqchildren 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 f2328cef..b6bf201c 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 children). + * Get selected items, but only root elements selected (without tqchildren). * * @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 89bb581c..01680fde 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -333,7 +333,7 @@ void UMLListViewItem::okRename( int col ) { UMLOperation *op = static_cast(m_pObject); UMLClassifier *parent = static_cast( op -> parent() ); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent); if (st == Model_Utils::PS_OK) { // TODO: Check that no operation with the exact same profile exists. op->setName( od.m_name ); @@ -385,7 +385,7 @@ void UMLListViewItem::okRename( int col ) { UMLClassifier *parent = static_cast(m_pObject->parent()); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; + Model_Utils::Parse_tqStatus st; st = Model_Utils::parseAttribute(newText, nt, parent, &vis); if (st == Model_Utils::PS_OK) { UMLObject *exists = parent->findChildObject(newText); @@ -417,7 +417,7 @@ void UMLListViewItem::okRename( int col ) { } UMLClassifier *parent = static_cast(m_pObject->parent()); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent); if (st == Model_Utils::PS_OK) { UMLObject *exists = parent->findChildObject(newText); if (exists) { @@ -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.").arg(m_Type), + i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(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 1064befc..596a93f5 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 children of the UMLListViewItem + * Returns the number of tqchildren of the UMLListViewItem * containing this object */ int childCount() const { @@ -213,7 +213,7 @@ public: /** * Find the UMLListViewItem that represents the given UMLClassifierListItem - * in the children of the current UMLListViewItem. (Only makes sense if + * in the tqchildren 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 aedc2325..a0e02160 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 children changes, for example, a UMLClass + * this signal when one of its tqchildren 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 aef18eca..a64b770c 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").arg(page + 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(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").arg( 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(rect.x(), footTop , windowWidth, footTop); @@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { void UMLView::setupNewWidget(UMLWidget *w) { w->setX( m_Pos.x() ); w->setY( m_Pos.y() ); - w->setVisible( true ); + w->tqsetVisible( true ); w->setActivated(); w->setFont( getFont() ); w->slotColorChanged( getID() ); @@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) { UMLWidget* newWidget = Widget_Factory::createWidget(this, o); if (newWidget == NULL) return; - newWidget->setVisible( true ); + newWidget->tqsetVisible( true ); newWidget->setActivated(); newWidget->setFont( getFont() ); newWidget->slotColorChanged( getID() ); @@ -1362,7 +1362,7 @@ void UMLView::activate() { continue; if (obj->activate()) { - obj->setVisible(true); + obj->tqsetVisible(true); } else { m_WidgetList.remove(obj); delete obj; @@ -1378,7 +1378,7 @@ void UMLView::activate() { continue; obj->activate(m_pDoc->getChangeLog()); - obj->setVisible( true ); + obj->tqsetVisible( true ); }//end while @@ -2365,7 +2365,7 @@ void UMLView::setMenu() { if( menu != ListPopupMenu::mt_Undefined ) { m_pMenu = new ListPopupMenu(this, menu, this); connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); - m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) ); + m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) ); } } @@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) { } int UMLView::currentZoom() { - return (int)(worldMatrix().m11()*100.0); + return (int)(tqworldMatrix().m11()*100.0); } void UMLView::zoomIn() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(1.5,1.5); // adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } void UMLView::zoomOut() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } @@ -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").arg(UMLView::defaultCanvasSize) ); + TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); m_nCanvasHeight = height.toInt(); - TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) ); + TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(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.geometry")) { + if (Uml::tagEq(tag, "Presentation.tqgeometry")) { 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 ce84e17c..4cf51b7f 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 children when they start a cut + * Called by the view or any of its tqchildren when they start a cut * operation. */ void setStartedCut() { @@ -1120,7 +1120,7 @@ protected: UMLWidgetList m_SelectedList; /** - * Flag if view/children started cut operation. + * Flag if view/tqchildren started cut operation. */ bool m_bStartedCut; @@ -1152,7 +1152,7 @@ private: bool m_bActivated; /** - * Status of a popupmenu on view. + * tqStatus of a popupmenu on view. * true - a popup is on view */ bool m_bPopupShowing; diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp index c669086d..23164171 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?").arg(m_imageURL.prettyURL()), + i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(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 155ba9b8..a8de3637 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").arg(url.directory()); + return i18n("Can not create directory: %1").tqarg(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").arg(fileName); + return i18n("A problem occured while saving diagram in %1").tqarg(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").arg(url.path()); + return i18n("There was a problem saving file: %1").tqarg(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 children, one for each view type (Logical, use case, components, deployment + // and five tqchildren, 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").arg(left).arg(bottom).arg(right).arg(top)); + TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top)); ts << fileContent; epsfile.close(); diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h index 6a74579f..0cebb9d8 100644 --- a/umbrello/umbrello/umlwidget.h +++ b/umbrello/umbrello/umlwidget.h @@ -466,7 +466,7 @@ public: /** * Set the m_bActivated flag of a widget but does not perform the Activate method * - * @param Active Status of activation is to be set. + * @param Active tqStatus of activation is to be set. */ void setActivated(bool Active = true); @@ -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 - * children should make sure that they don't have a menu active or there + * tqchildren should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ virtual void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp index bc9226dd..eeb51956 100644 --- a/umbrello/umbrello/widget_utils.cpp +++ b/umbrello/umbrello/widget_utils.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include -#include +#include #include #include #include @@ -101,7 +101,7 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) { SIZE, SIZE, currentView->canvas()); rect->setBrush( TQBrush(TQt::blue) ); rect->setPen( TQPen(TQt::blue) ); - rect->setVisible(true); + rect->tqsetVisible(true); return rect; } -- cgit v1.2.1
%1
%1 %2 %3 %4
%1%1
%1%1server()->attachmentViewLink( (*it).id ).url() + "\">" + i18n("View") + "