summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildtools/ada/adaproject_optionsdlgbase.ui18
-rw-r--r--buildtools/ant/antoptionswidget.ui6
-rw-r--r--buildtools/ant/antprojectpart.cpp4
-rw-r--r--buildtools/autotools/addapplicationdlgbase.ui12
-rw-r--r--buildtools/autotools/addexistingdlgbase.ui20
-rw-r--r--buildtools/autotools/addfiledlgbase.ui10
-rw-r--r--buildtools/autotools/addicondlg.cpp2
-rw-r--r--buildtools/autotools/addicondlgbase.ui4
-rw-r--r--buildtools/autotools/addservicedlgbase.ui10
-rw-r--r--buildtools/autotools/addsubprojectdlgbase.ui10
-rw-r--r--buildtools/autotools/addtargetdlg.cpp6
-rw-r--r--buildtools/autotools/addtargetdlgbase.ui6
-rw-r--r--buildtools/autotools/addtranslationdlg.cpp2
-rw-r--r--buildtools/autotools/autodetailsview.cpp8
-rw-r--r--buildtools/autotools/autoprojectpart.cpp14
-rw-r--r--buildtools/autotools/autoprojectviewbase.ui2
-rw-r--r--buildtools/autotools/autosubprojectview.cpp4
-rw-r--r--buildtools/autotools/choosetargetdlgbase.ui2
-rw-r--r--buildtools/autotools/configureoptionswidget.cpp18
-rw-r--r--buildtools/autotools/configureoptionswidgetbase.ui46
-rw-r--r--buildtools/autotools/fileselectorwidget.cpp4
-rw-r--r--buildtools/autotools/managecustomcommandsbase.ui2
-rw-r--r--buildtools/autotools/removefiledlgbase.ui6
-rw-r--r--buildtools/autotools/removetargetdlgbase.ui10
-rw-r--r--buildtools/autotools/subprojectoptionsdlg.cpp4
-rw-r--r--buildtools/autotools/subprojectoptionsdlgbase.ui30
-rw-r--r--buildtools/autotools/targetoptionsdlgbase.ui22
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidgetbase.ui6
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidgetbase.ui4
-rw-r--r--buildtools/custommakefiles/custommanagerwidgetbase.ui2
-rw-r--r--buildtools/custommakefiles/customotherconfigwidgetbase.ui2
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp24
-rw-r--r--buildtools/lib/parsers/autotools/tests/viewerbase.ui8
-rw-r--r--buildtools/lib/parsers/qmake/tests/viewerbase.ui8
-rw-r--r--buildtools/lib/widgets/environmentdisplaydialogbase.ui2
-rw-r--r--buildtools/lib/widgets/environmentvariableswidgetbase.ui4
-rw-r--r--buildtools/lib/widgets/envvartools.cpp2
-rw-r--r--buildtools/lib/widgets/makeoptionswidgetbase.ui4
-rw-r--r--buildtools/lib/widgets/removesubprojectdlgbase.ui8
-rw-r--r--buildtools/lib/widgets/subclassesdlgbase.ui6
-rw-r--r--buildtools/pascal/pascalproject_optionsdlgbase.ui18
-rw-r--r--buildtools/qmake/choosesubprojectdlgbase.ui2
-rw-r--r--buildtools/qmake/createscopedlgbase.ui4
-rw-r--r--buildtools/qmake/disablesubprojectdlgbase.ui2
-rw-r--r--buildtools/qmake/newwidgetdlgbase.ui6
-rw-r--r--buildtools/qmake/projectconfigurationdlgbase.ui32
-rw-r--r--buildtools/qmake/qmakeoptionswidgetbase.ui2
-rw-r--r--buildtools/qmake/trollprojectpart.cpp4
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp106
-rw-r--r--buildtools/script/scriptoptionswidgetbase.ui8
-rw-r--r--editors/editor-chooser/editchooser.ui2
-rw-r--r--embedded/visualboyadvance/vbaconfigwidgetbase.ui4
-rw-r--r--kdevdesigner/designer/about.ui6
-rw-r--r--kdevdesigner/designer/actiondnd.cpp8
-rw-r--r--kdevdesigner/designer/actiondnd.h2
-rw-r--r--kdevdesigner/designer/actioneditor.ui2
-rw-r--r--kdevdesigner/designer/command.cpp12
-rw-r--r--kdevdesigner/designer/configtoolboxdialog.ui6
-rw-r--r--kdevdesigner/designer/connectiondialog.ui2
-rw-r--r--kdevdesigner/designer/connectionitems.cpp10
-rw-r--r--kdevdesigner/designer/createtemplate.ui4
-rw-r--r--kdevdesigner/designer/customwidgeteditor.ui16
-rw-r--r--kdevdesigner/designer/customwidgeteditorimpl.cpp16
-rw-r--r--kdevdesigner/designer/dbconnectioneditor.ui4
-rw-r--r--kdevdesigner/designer/dbconnections.ui12
-rw-r--r--kdevdesigner/designer/designerapp.cpp2
-rw-r--r--kdevdesigner/designer/designerappiface.cpp8
-rw-r--r--kdevdesigner/designer/editfunctions.ui8
-rw-r--r--kdevdesigner/designer/finddialog.ui2
-rw-r--r--kdevdesigner/designer/formfile.cpp6
-rw-r--r--kdevdesigner/designer/formfile.h2
-rw-r--r--kdevdesigner/designer/formwindow.cpp16
-rw-r--r--kdevdesigner/designer/gotolinedialog.ui4
-rw-r--r--kdevdesigner/designer/iconvieweditor.ui10
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.cpp4
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h2
-rw-r--r--kdevdesigner/designer/layout.cpp12
-rw-r--r--kdevdesigner/designer/layout.h6
-rw-r--r--kdevdesigner/designer/listboxdnd.cpp10
-rw-r--r--kdevdesigner/designer/listboxeditor.ui10
-rw-r--r--kdevdesigner/designer/listboxrename.cpp4
-rw-r--r--kdevdesigner/designer/listeditor.ui2
-rw-r--r--kdevdesigner/designer/listviewdnd.cpp8
-rw-r--r--kdevdesigner/designer/listvieweditor.ui18
-rw-r--r--kdevdesigner/designer/mainwindow.cpp36
-rw-r--r--kdevdesigner/designer/mainwindowactions.cpp2
-rw-r--r--kdevdesigner/designer/menubareditor.cpp12
-rw-r--r--kdevdesigner/designer/menubareditor.h6
-rw-r--r--kdevdesigner/designer/metadatabase.cpp24
-rw-r--r--kdevdesigner/designer/metadatabase.h2
-rw-r--r--kdevdesigner/designer/multilineeditor.ui2
-rw-r--r--kdevdesigner/designer/multilineeditorimpl.cpp6
-rw-r--r--kdevdesigner/designer/newform.ui4
-rw-r--r--kdevdesigner/designer/paletteeditor.ui8
-rw-r--r--kdevdesigner/designer/paletteeditoradvanced.ui10
-rw-r--r--kdevdesigner/designer/pixmapchooser.cpp2
-rw-r--r--kdevdesigner/designer/pixmapcollectioneditor.ui2
-rw-r--r--kdevdesigner/designer/pixmapfunction.ui4
-rw-r--r--kdevdesigner/designer/popupmenueditor.cpp18
-rw-r--r--kdevdesigner/designer/preferences.ui4
-rw-r--r--kdevdesigner/designer/previewframe.cpp2
-rw-r--r--kdevdesigner/designer/previewwidget.ui4
-rw-r--r--kdevdesigner/designer/projectsettings.ui4
-rw-r--r--kdevdesigner/designer/propertyeditor.cpp80
-rw-r--r--kdevdesigner/designer/propertyeditor.h2
-rw-r--r--kdevdesigner/designer/propertyobject.cpp4
-rw-r--r--kdevdesigner/designer/propertyobject.h2
-rw-r--r--kdevdesigner/designer/qcompletionedit.cpp4
-rw-r--r--kdevdesigner/designer/replacedialog.ui2
-rw-r--r--kdevdesigner/designer/resource.cpp46
-rw-r--r--kdevdesigner/designer/richtextfontdialog.ui8
-rw-r--r--kdevdesigner/designer/sizehandle.cpp8
-rw-r--r--kdevdesigner/designer/startdialog.ui2
-rw-r--r--kdevdesigner/designer/styledbutton.cpp14
-rw-r--r--kdevdesigner/designer/styledbutton.h4
-rw-r--r--kdevdesigner/designer/tableeditor.ui18
-rw-r--r--kdevdesigner/designer/variabledialog.ui4
-rw-r--r--kdevdesigner/designer/widgetfactory.cpp68
-rw-r--r--kdevdesigner/designer/widgetfactory.h8
-rw-r--r--kdevdesigner/designer/wizardeditor.ui4
-rw-r--r--kdevdesigner/plugins/languageinterfaceimpl.cpp2
-rw-r--r--kdevdesigner/shared/parser.cpp2
-rw-r--r--kdevdesigner/shared/uib.cpp2
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.cpp28
-rw-r--r--languages/ada/README.dox2
-rw-r--r--languages/ada/ada_utils.cpp2
-rw-r--r--languages/ada/adasupportpart.cpp6
-rw-r--r--languages/ada/backgroundparser.cpp2
-rw-r--r--languages/ada/configproblemreporter.ui2
-rw-r--r--languages/bash/README.dox2
-rw-r--r--languages/cpp/README.dox2
-rw-r--r--languages/cpp/addattributedialog.cpp6
-rw-r--r--languages/cpp/addattributedialogbase.ui4
-rw-r--r--languages/cpp/addmethoddialog.cpp18
-rw-r--r--languages/cpp/addmethoddialogbase.ui4
-rw-r--r--languages/cpp/app_templates/kconfig35/prefs-base.ui6
-rw-r--r--languages/cpp/app_templates/kde4app/prefs_base.ui6
-rw-r--r--languages/cpp/app_templates/kscons_kxt/prefs-base.ui6
-rw-r--r--languages/cpp/app_templates/kxt/prefs-base.ui6
-rw-r--r--languages/cpp/app_templates/noatunui/plugin_impl.cpp2
-rw-r--r--languages/cpp/app_templates/opieapp/example.h2
-rw-r--r--languages/cpp/app_templates/opienet/simmplemodule.h4
-rw-r--r--languages/cpp/app_templates/opienet/simpleiface.cpp4
-rw-r--r--languages/cpp/app_templates/opienet/simplemodule.h4
-rw-r--r--languages/cpp/app_templates/opietoday/exampleplugin.cpp2
-rw-r--r--languages/cpp/app_templates/prc-tool/palmhello.c2
-rw-r--r--languages/cpp/ast_utils.cpp6
-rw-r--r--languages/cpp/ccconfigwidgetbase.ui30
-rw-r--r--languages/cpp/codeinformationrepository.cpp2
-rw-r--r--languages/cpp/cppcodecompletion.cpp6
-rw-r--r--languages/cpp/cppcodecompletionconfig.cpp2
-rw-r--r--languages/cpp/cppnewclassdlg.cpp12
-rw-r--r--languages/cpp/cppnewclassdlgbase.ui18
-rw-r--r--languages/cpp/cppsplitheadersourceconfig.cpp2
-rw-r--r--languages/cpp/cppsupportpart.cpp30
-rw-r--r--languages/cpp/creategettersetter.ui4
-rw-r--r--languages/cpp/creategettersetterconfiguration.cpp2
-rw-r--r--languages/cpp/createpcsdialogbase.ui4
-rw-r--r--languages/cpp/debugger/TODO.txt2
-rw-r--r--languages/cpp/debugger/dbgcontroller.h2
-rw-r--r--languages/cpp/debugger/dbgtoolbar.cpp36
-rw-r--r--languages/cpp/debugger/dbgtoolbar.h2
-rw-r--r--languages/cpp/debugger/debuggerconfigwidget.cpp2
-rw-r--r--languages/cpp/debugger/debuggerconfigwidgetbase.ui2
-rw-r--r--languages/cpp/debugger/debuggerpart.cpp24
-rw-r--r--languages/cpp/debugger/debuggerpart.h2
-rw-r--r--languages/cpp/debugger/debuggertracingdialogbase.ui2
-rw-r--r--languages/cpp/debugger/gdbbreakpointwidget.cpp12
-rw-r--r--languages/cpp/debugger/gdbcontroller.cpp26
-rw-r--r--languages/cpp/debugger/gdbcontroller.h2
-rw-r--r--languages/cpp/debugger/gdboutputwidget.cpp8
-rw-r--r--languages/cpp/debugger/gdboutputwidget.h2
-rw-r--r--languages/cpp/debugger/variablewidget.cpp4
-rw-r--r--languages/cpp/includepathresolver.cpp4
-rw-r--r--languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h2
-rw-r--r--languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h2
-rw-r--r--languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui2
-rw-r--r--languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h2
-rw-r--r--languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui2
-rw-r--r--languages/cpp/qtdesignercppintegration.cpp16
-rw-r--r--languages/cpp/subclassingdlgbase.ui2
-rw-r--r--languages/csharp/README.dox2
-rw-r--r--languages/fortran/README.dox2
-rw-r--r--languages/fortran/ftnchekconfigwidget.cpp2
-rw-r--r--languages/fortran/ftnchekconfigwidgetbase.ui10
-rw-r--r--languages/java/README.dox2
-rw-r--r--languages/java/configproblemreporter.ui2
-rw-r--r--languages/java/problemreporter.cpp8
-rw-r--r--languages/kjssupport/subclassingdlgbase.ui2
-rw-r--r--languages/lib/designer_integration/implementationwidgetbase.ui2
-rw-r--r--languages/pascal/README.dox2
-rw-r--r--languages/pascal/configproblemreporter.ui2
-rw-r--r--languages/pascal/pascalsupport_part.cpp10
-rw-r--r--languages/perl/README.dox2
-rw-r--r--languages/php/README.dox2
-rw-r--r--languages/php/phpcodecompletion.cpp12
-rw-r--r--languages/php/phpconfigwidgetbase.ui14
-rw-r--r--languages/php/phpfile.cpp2
-rw-r--r--languages/php/phpinfodlg.ui4
-rw-r--r--languages/php/phpnewclassdlgbase.ui2
-rw-r--r--languages/python/README.dox2
-rw-r--r--languages/python/pythonconfigwidgetbase.ui6
-rw-r--r--languages/python/pythonsupportpart.cpp2
-rw-r--r--languages/ruby/README.dox2
-rw-r--r--languages/ruby/app_templates/kxt/prefs-base.ui6
-rw-r--r--languages/ruby/debugger/dbgcontroller.h2
-rw-r--r--languages/ruby/debugger/dbgpsdlg.cpp4
-rw-r--r--languages/ruby/debugger/dbgtoolbar.cpp36
-rw-r--r--languages/ruby/debugger/dbgtoolbar.h2
-rw-r--r--languages/ruby/debugger/debuggerpart.cpp16
-rw-r--r--languages/ruby/debugger/debuggerpart.h2
-rw-r--r--languages/ruby/debugger/rdbbreakpointwidget.cpp12
-rw-r--r--languages/ruby/debugger/rdbcontroller.cpp24
-rw-r--r--languages/ruby/debugger/rdboutputwidget.cpp6
-rw-r--r--languages/ruby/debugger/rdboutputwidget.h2
-rw-r--r--languages/ruby/debugger/variablewidget.cpp2
-rw-r--r--languages/ruby/rubyconfigwidgetbase.ui4
-rw-r--r--languages/ruby/rubysupport_part.cpp2
-rw-r--r--languages/sql/README.dox2
-rw-r--r--languages/sql/sqlconfigwidget.ui2
-rw-r--r--languages/sql/sqlsupport_part.cpp4
-rw-r--r--lib/catalog/tag.h2
-rw-r--r--lib/cppparser/ast.cpp2
-rw-r--r--lib/cppparser/lexer.cpp6
-rw-r--r--lib/cppparser/lexercache.cpp6
-rw-r--r--lib/cppparser/lexercache.h2
-rw-r--r--lib/interfaces/extensions/kdevcreatefile.h4
-rw-r--r--lib/interfaces/extensions/kdevversioncontrol.h6
-rw-r--r--lib/interfaces/external/designer.h2
-rw-r--r--lib/util/blockingkprocess.cpp4
-rw-r--r--lib/util/filetemplate.cpp4
-rw-r--r--lib/util/settings.cpp6
-rw-r--r--lib/widgets/flagboxes.cpp2
-rw-r--r--lib/widgets/processwidget.cpp6
-rw-r--r--lib/widgets/processwidget.h2
-rw-r--r--lib/widgets/propeditor/pcheckbox.cpp2
-rw-r--r--lib/widgets/propeditor/pcolorbutton.cpp2
-rw-r--r--lib/widgets/propeditor/pcolorcombo.cpp2
-rw-r--r--lib/widgets/propeditor/pcombobox.cpp2
-rw-r--r--lib/widgets/propeditor/pdateedit.cpp2
-rw-r--r--lib/widgets/propeditor/pdatetimeedit.cpp2
-rw-r--r--lib/widgets/propeditor/pdoublenuminput.cpp2
-rw-r--r--lib/widgets/propeditor/pfontbutton.cpp2
-rw-r--r--lib/widgets/propeditor/pfontcombo.cpp2
-rw-r--r--lib/widgets/propeditor/plineedit.cpp2
-rw-r--r--lib/widgets/propeditor/plinestyleedit.cpp2
-rw-r--r--lib/widgets/propeditor/ppixmapedit.cpp4
-rw-r--r--lib/widgets/propeditor/ppointedit.cpp2
-rw-r--r--lib/widgets/propeditor/prectedit.cpp2
-rw-r--r--lib/widgets/propeditor/propertyeditor.cpp8
-rw-r--r--lib/widgets/propeditor/psizeedit.cpp2
-rw-r--r--lib/widgets/propeditor/psizepolicyedit.cpp2
-rw-r--r--lib/widgets/propeditor/pspinbox.cpp2
-rw-r--r--lib/widgets/propeditor/pstringlistedit.cpp4
-rw-r--r--lib/widgets/propeditor/psymbolcombo.cpp4
-rw-r--r--lib/widgets/propeditor/purledit.cpp2
-rw-r--r--lib/widgets/propeditor/pyesnobutton.cpp2
-rw-r--r--lib/widgets/propeditor/qeditlistbox.cpp2
-rw-r--r--lib/widgets/qcomboview.cpp48
-rw-r--r--lib/widgets/qcomboview.h2
-rw-r--r--parts/abbrev/abbrevconfigwidgetbase.ui2
-rw-r--r--parts/abbrev/addtemplatedlgbase.ui4
-rw-r--r--parts/appwizard/appwizarddlg.cpp2
-rw-r--r--parts/appwizard/appwizarddlgbase.ui10
-rw-r--r--parts/appwizard/importdlgbase.ui6
-rw-r--r--parts/appwizard/kdevlicense.cpp2
-rw-r--r--parts/appwizard/vcs_form.ui2
-rw-r--r--parts/astyle/astyleconfig.ui22
-rw-r--r--parts/bookmarks/bookmarks_settings_base.ui6
-rw-r--r--parts/bookmarks/bookmarks_widget.cpp2
-rw-r--r--parts/classview/classtooldlg.cpp12
-rw-r--r--parts/classview/classtreebase.cpp2
-rw-r--r--parts/classview/classviewwidget.cpp2
-rw-r--r--parts/classview/digraphview.cpp4
-rw-r--r--parts/classview/digraphview.h2
-rw-r--r--parts/classview/hierarchydlg.cpp4
-rw-r--r--parts/ctags2/ctags2_createtagfilebase.ui2
-rw-r--r--parts/ctags2/ctags2_selecttagfilebase.ui2
-rw-r--r--parts/ctags2/ctags2_settingswidgetbase.ui4
-rw-r--r--parts/ctags2/ctags2_widgetbase.ui2
-rw-r--r--parts/distpart/distpart_ui.ui22
-rw-r--r--parts/distpart/distpart_widget.cpp2
-rw-r--r--parts/documentation/addcatalogdlgbase.ui4
-rw-r--r--parts/documentation/docglobalconfigwidgetbase.ui8
-rw-r--r--parts/documentation/docprojectconfigwidgetbase.ui2
-rw-r--r--parts/documentation/documentation_part.cpp16
-rw-r--r--parts/documentation/editbookmarkdlg.ui4
-rw-r--r--parts/documentation/editcatalogdlgbase.ui4
-rw-r--r--parts/documentation/find_documentation.cpp4
-rw-r--r--parts/documentation/find_documentation_optionsbase.ui6
-rw-r--r--parts/documentation/find_documentationbase.ui2
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.cpp4
-rw-r--r--parts/documentation/plugins/chm/docchmplugin.cpp2
-rw-r--r--parts/documentation/protocols/chm/chm.cpp2
-rw-r--r--parts/documentation/selecttopicbase.ui2
-rw-r--r--parts/doxygen/doxygenconfigwidget.cpp4
-rw-r--r--parts/doxygen/doxygenconfigwidget.h2
-rw-r--r--parts/filecreate/addglobaldlg.cpp2
-rw-r--r--parts/filecreate/fcconfigwidgetbase.ui12
-rw-r--r--parts/filecreate/fctemplateeditbase.ui4
-rw-r--r--parts/filecreate/fctypeeditbase.ui6
-rw-r--r--parts/filecreate/file-templates/ui-confdialog2
-rw-r--r--parts/filecreate/file-templates/ui-dialogb2
-rw-r--r--parts/filecreate/file-templates/ui-dialogb-qt42
-rw-r--r--parts/filecreate/file-templates/ui-dialogr2
-rw-r--r--parts/filecreate/file-templates/ui-dialogr-qt42
-rw-r--r--parts/filecreate/file-templates/ui-tabdialog2
-rw-r--r--parts/filecreate/filecreate_part.cpp2
-rw-r--r--parts/filecreate/filecreate_widget2.cpp4
-rw-r--r--parts/filelist/filelist_widget.cpp2
-rw-r--r--parts/filelist/projectviewconfigbase.ui2
-rw-r--r--parts/filelist/projectviewprojectconfigbase.ui4
-rw-r--r--parts/fileselector/fileselector_widget.cpp6
-rw-r--r--parts/fileview/filegroupsconfigwidgetbase.ui6
-rw-r--r--parts/fileview/filegroupswidget.cpp2
-rw-r--r--parts/fileview/filetreeviewwidgetimpl.cpp2
-rw-r--r--parts/fileview/partwidget.cpp2
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp10
-rw-r--r--parts/grepview/grepdlg.cpp8
-rw-r--r--parts/grepview/grepviewpart.cpp2
-rw-r--r--parts/openwith/openwithpart.cpp6
-rw-r--r--parts/outputviews/compileerrorfilter.cpp4
-rw-r--r--parts/outputviews/directorystatusmessagefilter.cpp6
-rw-r--r--parts/outputviews/filterdlg.ui2
-rw-r--r--parts/outputviews/makewidget.cpp14
-rw-r--r--parts/partexplorer/partexplorerform.cpp4
-rw-r--r--parts/quickopen/quickopenbase.ui2
-rw-r--r--parts/quickopen/quickopenfunctionchooseformbase.ui2
-rw-r--r--parts/regexptest/regexptestdlgbase.ui2
-rw-r--r--parts/replace/replace_part.cpp2
-rw-r--r--parts/replace/replace_widget.cpp4
-rw-r--r--parts/replace/replacedlg.ui4
-rw-r--r--parts/replace/replaceitem.cpp8
-rw-r--r--parts/replace/replaceview.cpp2
-rw-r--r--parts/scripting/scriptingpart.cpp4
-rw-r--r--parts/snippet/snippet_part.cpp4
-rw-r--r--parts/snippet/snippet_widget.cpp10
-rw-r--r--parts/snippet/snippetdlg.ui4
-rw-r--r--parts/snippet/snippetsettingsbase.ui6
-rw-r--r--parts/tools/addtooldlg.ui2
-rw-r--r--parts/tools/kapplicationtree.cpp4
-rw-r--r--parts/tools/toolsconfigwidgetbase.ui18
-rw-r--r--parts/valgrind/dialog_widget.ui2
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfigbase.ui2
-rw-r--r--src/generalinfowidgetbase.ui8
-rw-r--r--src/kdevideextension.cpp2
-rw-r--r--src/languageselectwidget.cpp10
-rw-r--r--src/mimewarningdialog.ui6
-rw-r--r--src/newui/button.cpp30
-rw-r--r--src/newui/button.h4
-rw-r--r--src/newui/buttonbar.cpp20
-rw-r--r--src/newui/buttonbar.h4
-rw-r--r--src/newui/ddockwindow.cpp10
-rw-r--r--src/newui/dmainwindow.cpp2
-rw-r--r--src/newui/docksplitter.cpp2
-rw-r--r--src/partcontroller.cpp12
-rw-r--r--src/partcontroller.h4
-rw-r--r--src/plugincontroller.cpp4
-rw-r--r--src/pluginselectdialogbase.ui4
-rw-r--r--src/profileengine/editor/profileeditor.cpp2
-rw-r--r--src/profileengine/editor/profileeditorbase.ui10
-rw-r--r--src/profileengine/lib/profileengine.cpp28
-rw-r--r--src/projectmanager.cpp6
-rw-r--r--src/settingswidget.ui10
-rw-r--r--src/statusbar.cpp10
-rw-r--r--src/statusbar.h4
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.cpp2
-rw-r--r--vcs/clearcase/clearcasefileinfoprovider.h2
-rw-r--r--vcs/clearcase/commentdlg.cpp2
-rw-r--r--vcs/clearcase/integrator/ccintegratordlgbase.ui2
-rw-r--r--vcs/cvsservice/annotateview.cpp4
-rw-r--r--vcs/cvsservice/annotateview.h2
-rw-r--r--vcs/cvsservice/changelog.cpp2
-rw-r--r--vcs/cvsservice/checkoutdialogbase.ui4
-rw-r--r--vcs/cvsservice/commitdialogbase.ui2
-rw-r--r--vcs/cvsservice/cvsdir.cpp12
-rw-r--r--vcs/cvsservice/cvsdir.h6
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.cpp22
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.h2
-rw-r--r--vcs/cvsservice/cvsformbase.ui2
-rw-r--r--vcs/cvsservice/cvsoptions.cpp6
-rw-r--r--vcs/cvsservice/cvspart.cpp32
-rw-r--r--vcs/cvsservice/cvspartimpl.cpp4
-rw-r--r--vcs/cvsservice/diffdialogbase.ui2
-rw-r--r--vcs/cvsservice/editorsdialogbase.ui2
-rw-r--r--vcs/cvsservice/integrator/fetcherdlgbase.ui2
-rw-r--r--vcs/cvsservice/integrator/initdlg.ui2
-rw-r--r--vcs/cvsservice/integrator/integratordlgbase.ui6
-rw-r--r--vcs/cvsservice/releaseinputdialogbase.ui2
-rw-r--r--vcs/cvsservice/tagdialogbase.ui2
-rw-r--r--vcs/perforce/integrator/pfintegratordlgbase.ui2
-rw-r--r--vcs/perforce/perforcepart.cpp14
-rw-r--r--vcs/subversion/commitdlgbase.ui2
-rw-r--r--vcs/subversion/integrator/svnintegratordlgbase.ui2
-rw-r--r--vcs/subversion/kdevsvnd.cpp30
-rw-r--r--vcs/subversion/subversion_fileinfo.cpp8
-rw-r--r--vcs/subversion/subversion_fileinfo.h4
-rw-r--r--vcs/subversion/subversion_part.cpp30
-rw-r--r--vcs/subversion/subversiondiff.ui2
-rw-r--r--vcs/subversion/svn_co.ui2
-rw-r--r--vcs/subversion/svn_commitdlgbase.ui2
-rw-r--r--vcs/subversion/svn_copydlgwidget.ui2
-rw-r--r--vcs/subversion/svn_fileselectdlg_commit.cpp10
-rw-r--r--vcs/subversion/svn_logviewwidget.cpp6
-rw-r--r--vcs/subversion/svn_mergeoptiondlgbase.ui2
-rw-r--r--vcs/subversion/svn_switchdlgbase.ui2
406 files changed, 1418 insertions, 1418 deletions
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui
index 7804c9c3..f6ee3232 100644
--- a/buildtools/ada/adaproject_optionsdlgbase.ui
+++ b/buildtools/ada/adaproject_optionsdlgbase.ui
@@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -144,7 +144,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -267,7 +267,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -278,7 +278,7 @@
<property name="name">
<cstring>mainSourceUrl</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -317,7 +317,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -334,7 +334,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>20</height>
diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui
index d5dea45a..fd7ece90 100644
--- a/buildtools/ant/antoptionswidget.ui
+++ b/buildtools/ant/antoptionswidget.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>86</height>
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>86</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>16</height>
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index 52e4fc51..bb3f958a 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -564,13 +564,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
{
int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr),
this, TQT_SLOT(slotRemoveFromProject()) );
- popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
+ popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
}
else
{
int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr),
this, TQT_SLOT(slotAddToProject()) );
- popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
+ popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
}
}
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 234fa8b3..85c754f9 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -66,7 +66,7 @@
<property name="name">
<cstring>icon_button</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -370,7 +370,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -403,7 +403,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -456,7 +456,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui
index 47c8dcef..61b34640 100644
--- a/buildtools/autotools/addexistingdlgbase.ui
+++ b/buildtools/autotools/addexistingdlgbase.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>317</width>
<height>20</height>
@@ -93,7 +93,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>84</width>
<height>20</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>84</width>
<height>20</height>
@@ -297,13 +297,13 @@
<property name="name">
<cstring>sourceGroupBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>240</width>
<height>250</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -349,7 +349,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -388,7 +388,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -401,13 +401,13 @@
<property name="name">
<cstring>destGroupBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>140</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui
index 79029915..0d86b1a0 100644
--- a/buildtools/autotools/addfiledlgbase.ui
+++ b/buildtools/autotools/addfiledlgbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -150,7 +150,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -188,7 +188,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 81d0d859..639c04ce 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -105,7 +105,7 @@ void AddIconDialog::accept()
m_target->sources.append(fitem);
m_target->insertItem(fitem);
- m_part->startMakeCommand(destdir, TQString::tqfromLatin1("force-reedit"));
+ m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit"));
m_widget->emitAddedFile(destpath);
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index 14947fe2..b9ac24a8 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index 82b7ee9d..540f0f1c 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -77,7 +77,7 @@
<property name="name">
<cstring>icon_button</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -307,7 +307,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -436,7 +436,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui
index 7505f390..3c2e4828 100644
--- a/buildtools/autotools/addsubprojectdlgbase.ui
+++ b/buildtools/autotools/addsubprojectdlgbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -73,7 +73,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -102,7 +102,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp
index 868cc504..d2a832c1 100644
--- a/buildtools/autotools/addtargetdlg.cpp
+++ b/buildtools/autotools/addtargetdlg.cpp
@@ -165,13 +165,13 @@ void AddTargetDialog::accept()
#endif
if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() )
- name.prepend( TQString::tqfromLatin1("lib") );
+ name.prepend( TQString::fromLatin1("lib") );
if( primary == "LTLIBRARIES" && !name.endsWith(".la") )
- name.append( TQString::tqfromLatin1(".la") );
+ name.append( TQString::fromLatin1(".la") );
if ( primary == "LIBRARIES" && !name.endsWith(".a") )
- name.append ( TQString::tqfromLatin1(".a") );
+ name.append ( TQString::fromLatin1(".a") );
TQPtrListIterator<TargetItem> it(m_subproject->targets);
for (; it.current(); ++it)
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 763d5984..34c028af 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -112,7 +112,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>246</width>
<height>20</height>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -261,7 +261,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 9962aeb2..3559d1ed 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -101,7 +101,7 @@ void AddTranslationDialog::accept()
f.close();
dir = m_part->buildDirectory() + "/po";
- m_part->startMakeCommand(dir, TQString::tqfromLatin1("force-reedit"));
+ m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit"));
TQDialog::accept();
}
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 45d0886e..b7061a0a 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"),
i18n("Subclassing Wizard...") );
- popup.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
+ popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
"<b>Subclassing</b> wizard. "
"It allows to create a subclass from the "
"class defined in .ui file. "
@@ -572,19 +572,19 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
"class."));
int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"),
i18n("List of Subclasses..."));
- popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
+ popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
"subclasses list editor. "
"There is possibility to add or remove "
"subclasses from the list."));
int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"),
i18n("Edit ui-Subclass..."));
- popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
+ popup.setWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
"<b>Subclassing</b> wizard and prompts "
"to implement missing in childclass "
"slots and functions."));
int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"),
i18n("Open ui.h File"));
- popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
+ popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
"associated with the selected .ui."));
if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true)
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 7f17cb6d..107a2fc5 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild()
m_needMakefileCvs = false;
}
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1(""));
+ startMakeCommand(buildDirectory(), TQString::fromLatin1(""));
}
@@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs()
void AutoProjectPart::slotInstall()
{
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"));
+ startMakeCommand(buildDirectory(), TQString::fromLatin1("install"));
}
@@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu()
slotBuild();
// After that issue "make install" with the root user
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
+ startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
}
void AutoProjectPart::slotClean()
{
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean"));
+ startMakeCommand(buildDirectory(), TQString::fromLatin1("clean"));
}
void AutoProjectPart::slotDistClean()
{
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean"));
+ startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean"));
}
void AutoProjectPart::slotMakeMessages()
{
- startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages"));
+ startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages"));
}
@@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute()
if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autotdesu", false) ){
//slotInstallWithKdesu assumes that it hasn't just been build...
kdDebug(9020) << "slotExecute: before startMakeCommand" << endl;
- _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
+ _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
}
else{
kdDebug(9020) << "slotExecute: before slotInstall" << endl;
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index 625ab370..7056c640 100644
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 5916b332..7230b20c 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -422,7 +422,7 @@ void AutoSubprojectView::slotBuildSubproject()
TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() );
- m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::tqfromLatin1( "" ) );
+ m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) );
}
void AutoSubprojectView::slotRemoveSubproject()
@@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject()
}
parent->listView()->setSelected( parent, true );
- kapp->tqprocessEvents( 500 );
+ kapp->processEvents( 500 );
if( removeSources ){
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index b754d1f7..927ad6eb 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -12,7 +12,7 @@
<height>306</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>444</width>
<height>306</height>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index d847a559..afa50b2e 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -111,15 +111,15 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget()
void ConfigureOptionsWidget::fixLayout()
{
- int w1 = ccompiler_label->tqsizeHint().width();
- int w2 = cbinary_label->tqsizeHint().width();
- int w3 = cflags_label->tqsizeHint().width();
- int w4 = cxxcompiler_label->tqsizeHint().width();
- int w5 = cxxbinary_label->tqsizeHint().width();
- int w6 = cxxflags_label->tqsizeHint().width();
- int w7 = f77compiler_label->tqsizeHint().width();
- int w8 = f77binary_label->tqsizeHint().width();
- int w9 = f77flags_label->tqsizeHint().width();
+ int w1 = ccompiler_label->sizeHint().width();
+ int w2 = cbinary_label->sizeHint().width();
+ int w3 = cflags_label->sizeHint().width();
+ int w4 = cxxcompiler_label->sizeHint().width();
+ int w5 = cxxbinary_label->sizeHint().width();
+ int w6 = cxxflags_label->sizeHint().width();
+ int w7 = f77compiler_label->sizeHint().width();
+ int w8 = f77binary_label->sizeHint().width();
+ int w9 = f77flags_label->sizeHint().width();
int w = TQMAX(w1, TQMAX(w2, w3));
w = TQMAX(w, TQMAX(w4, w5));
diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui
index 35315f76..9090f705 100644
--- a/buildtools/autotools/configureoptionswidgetbase.ui
+++ b/buildtools/autotools/configureoptionswidgetbase.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -233,13 +233,13 @@ probably want this to be blank.</string>
<property name="name">
<cstring>builddir_button</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -259,7 +259,7 @@ probably want this to be blank.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -270,13 +270,13 @@ probably want this to be blank.</string>
<property name="name">
<cstring>topsourcedir_button</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -313,7 +313,7 @@ then it is relative to the project directory.
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -345,7 +345,7 @@ nonstandard directory &lt;lib dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -388,7 +388,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -481,7 +481,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -516,7 +516,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -536,7 +536,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>168</height>
@@ -569,7 +569,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -615,7 +615,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -648,7 +648,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -683,7 +683,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -703,7 +703,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -749,7 +749,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -782,7 +782,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -817,7 +817,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -837,7 +837,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index a403337d..7173d711 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -98,7 +98,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
hlow->setMaximumHeight(up->height());
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion();
cmbPath->setCompletionObject( cmpl );
lo->addWidget(cmbPath);
@@ -114,7 +114,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
filterIcon = new TQLabel(filterBox);
filterIcon->setPixmap( BarIcon("filter") );
filter = new KHistoryCombo(filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
lo->addWidget(filterBox);
diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui
index 3690fa32..eab430e9 100644
--- a/buildtools/autotools/managecustomcommandsbase.ui
+++ b/buildtools/autotools/managecustomcommandsbase.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui
index 606d7e0f..5dbd03cd 100644
--- a/buildtools/autotools/removefiledlgbase.ui
+++ b/buildtools/autotools/removefiledlgbase.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>247</width>
<height>20</height>
@@ -69,7 +69,7 @@
<property name="name">
<cstring>fileGroupBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -110,7 +110,7 @@
<property name="name">
<cstring>noticeLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui
index 4f8fb286..514bdbaa 100644
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@@ -100,13 +100,13 @@
<property name="name">
<cstring>fileGroupBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>140</height>
@@ -139,7 +139,7 @@
<property name="name">
<cstring>textLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index 139193b4..a13ba30b 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
TQString subProjectName = *it;
if( subProjectName.isEmpty() ){
- subProjectName = TQString::tqfromLatin1( "." );
+ subProjectName = TQString::fromLatin1( "." );
}
TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox);
if (lastItem)
@@ -182,7 +182,7 @@ void SubprojectOptionsDialog::storeConfig()
}
TQString old_metasources = subProject->variables["METASOURCES"];
- TQString new_metasources = metasources_checkbox->isChecked() ? TQString::tqfromLatin1("AUTO") : TQString();
+ TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString();
if (new_metasources != old_metasources) {
subProject->variables["METASOURCES"] = new_metasources;
replaceMap.insert("METASOURCES", new_metasources);
diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui
index be60569f..2960dc4b 100644
--- a/buildtools/autotools/subprojectoptionsdlgbase.ui
+++ b/buildtools/autotools/subprojectoptionsdlgbase.ui
@@ -85,7 +85,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>25</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>25</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -235,7 +235,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>25</height>
@@ -260,7 +260,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -325,7 +325,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -358,7 +358,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -432,7 +432,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -618,7 +618,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -659,7 +659,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -702,7 +702,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -735,7 +735,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -802,7 +802,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui
index 4b883535..7e721a42 100644
--- a/buildtools/autotools/targetoptionsdlgbase.ui
+++ b/buildtools/autotools/targetoptionsdlgbase.ui
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -256,7 +256,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>7</height>
@@ -318,7 +318,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -351,7 +351,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -400,7 +400,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -457,7 +457,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
@@ -586,7 +586,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index 4858696b..904205eb 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index ece262fe..b4a3485a 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>192</width>
<height>20</height>
diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui
index c74ef412..a141c0b1 100644
--- a/buildtools/custommakefiles/custommanagerwidgetbase.ui
+++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui
@@ -55,7 +55,7 @@ This will be used when adding/removing files in directories and re-populating th
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>108</height>
diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
index ffba0357..62c72ad2 100644
--- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index ecdabd64..88e7ee03 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -242,7 +242,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 );
int id = popup->insertItem( i18n( "Make Active Directory" ),
this, TQT_SLOT( slotChooseActiveDirectory() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>"
+ popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>"
"Chooses this directory as the destination for new files created using wizards "
"like the <i>New Class</i> wizard." ) );
}
@@ -258,7 +258,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
id = popup->insertItem( i18n( "Remove from blacklist" ),
this, TQT_SLOT( slotChangeBlacklist() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
+ popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
"Removes the given file or directory from the "
"blacklist if it is already in it.<br>The blacklist contains files and"
" directories that should be ignored even if they match a project filetype "
@@ -268,7 +268,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
id = popup->insertItem( i18n( "Add to blacklist" ),
this, TQT_SLOT( slotChangeBlacklist() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
+ popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
"Adds the given file or directory to the blacklist.<br>The blacklist contains files and"
" directories that should be ignored even if they match a project filetype "
"pattern" ) );
@@ -318,13 +318,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ),
this, TQT_SLOT( slotAddToProject() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
+ popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
"Note that the files should be manually added to the corresponding makefile or build.xml." ) );
if ( dirAddRecursive )
{
int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ),
this, TQT_SLOT( slotAddToProjectRecursive() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
+ popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
"Note that the files should be manually added to the corresponding makefile or build.xml." ) );
}
}
@@ -333,14 +333,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ),
this, TQT_SLOT( slotRemoveFromProject() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
+ popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
"Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
if ( dirDelRecursive )
{
int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ),
this, TQT_SLOT( slotRemoveFromProjectRecursive() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
+ popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
"Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
}
}
@@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile()
void CustomProjectPart::slotInstallActiveDir()
{
- startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) );
+ startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) );
}
void CustomProjectPart::slotInstall()
{
- startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) );
+ startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) );
}
@@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu()
slotBuild();
// After that issue "make install" with the root user
- startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
+ startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
}
void CustomProjectPart::slotClean()
{
- startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) );
+ startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) );
}
@@ -1056,7 +1056,7 @@ void CustomProjectPart::slotExecute()
// Use tdesu??
if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autotdesu", false ) )
//slotInstallWithKdesu assumes that it hasn't just been build...
- _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
+ _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
else
slotInstall();
_auto = true;
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index e319e2b4..1c71c94b 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -128,7 +128,7 @@
<property name="name">
<cstring>allLocation</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
@@ -139,7 +139,7 @@
<property name="name">
<cstring>addAll</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
@@ -153,7 +153,7 @@
<property name="name">
<cstring>choose</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
@@ -175,7 +175,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index 1308cc1d..3093e298 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -38,7 +38,7 @@
<property name="name">
<cstring>allLocation</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -49,7 +49,7 @@
<property name="name">
<cstring>addAll</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -63,7 +63,7 @@
<property name="name">
<cstring>choose</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -85,7 +85,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index e19d27a0..1f15b75a 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>21</height>
diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
index c06239f7..e7246de3 100644
--- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui
+++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>171</height>
diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp
index 13b1391a..71c44377 100644
--- a/buildtools/lib/widgets/envvartools.cpp
+++ b/buildtools/lib/widgets/envvartools.cpp
@@ -23,7 +23,7 @@
TQString EnvVarTools::quote( const TQString & arg )
{
TQString res = arg;
- res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
+ res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''"));
res.prepend("\"");
res.append("\"");
return res;
diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui
index 4f0829ae..9caba3ee 100644
--- a/buildtools/lib/widgets/makeoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui
index e891ff07..d5206ac6 100644
--- a/buildtools/lib/widgets/removesubprojectdlgbase.ui
+++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui
@@ -23,13 +23,13 @@
<property name="name">
<cstring>fileGroupBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>140</height>
@@ -65,7 +65,7 @@
<property name="name">
<cstring>noticeLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 100100cb..6df8ca17 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -53,7 +53,7 @@
<property name="name">
<cstring>subclass_url</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>310</width>
<height>20</height>
diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui
index f3ffb8c2..8defc492 100644
--- a/buildtools/pascal/pascalproject_optionsdlgbase.ui
+++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -129,7 +129,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -235,7 +235,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>20</height>
@@ -305,7 +305,7 @@
<property name="name">
<cstring>mainSourceUrl</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui
index df01a06c..f1e2e579 100644
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui
index 4ba7212e..bb1257b7 100644
--- a/buildtools/qmake/createscopedlgbase.ui
+++ b/buildtools/qmake/createscopedlgbase.ui
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>95</width>
<height>20</height>
@@ -248,7 +248,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui
index d7b78289..fadafc04 100644
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui
index 178fa761..243fbff3 100644
--- a/buildtools/qmake/newwidgetdlgbase.ui
+++ b/buildtools/qmake/newwidgetdlgbase.ui
@@ -95,7 +95,7 @@
<property name="name">
<cstring>ui_classnameEd</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -124,7 +124,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>160</height>
@@ -159,7 +159,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>310</width>
<height>0</height>
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 2df4d131..1ded80ef 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>16</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -338,7 +338,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
@@ -816,7 +816,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -893,7 +893,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -950,7 +950,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1055,7 +1055,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -1162,7 +1162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -1258,7 +1258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>64</height>
@@ -1330,7 +1330,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1418,7 +1418,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1514,7 +1514,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>64</height>
@@ -1589,7 +1589,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1867,7 +1867,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -2010,7 +2010,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>106</height>
@@ -2130,7 +2130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>250</width>
<height>20</height>
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 312536bc..7f30c4e1 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -199,7 +199,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index abd26606..dd8f85d0 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -710,7 +710,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
cmdline += " -recursive ";
}
- //TQString cmdline = TQString::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " );
+ //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " );
// cmdline += fi.baseName() + ".pro";
TQDir d(dir);
TQStringList l = d.entryList("*.pro");
@@ -722,7 +722,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
else
cmdline += l[0];
-// cmdline += TQString::tqfromLatin1( " -o Makefile" );
+// cmdline += TQString::fromLatin1( " -o Makefile" );
TQString dircmd = "cd ";
dircmd += KProcess::quote(dir);
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index f2aca642..65fdfcc2 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -93,7 +93,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
overviewContainer = new TQVBox( splitter, "Projects" );
overviewContainer->setMargin ( 2 );
overviewContainer->setSpacing ( 2 );
- // overviewContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+ // overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
// splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint);
projectTools = new TQHBox( overviewContainer, "Project buttons" );
@@ -102,7 +102,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Add subdir
addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" );
addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) );
- addSubdirButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
+ addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
addSubdirButton->setEnabled ( true );
TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) );
TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
@@ -111,7 +111,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Create scope
createScopeButton = new TQToolButton ( projectTools, "Create scope button" );
createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) );
- createScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
+ createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
createScopeButton->setEnabled ( true );
TQToolTip::add( createScopeButton, i18n( "Create scope" ) );
TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) );
@@ -119,7 +119,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// build
buildProjectButton = new TQToolButton ( projectTools, "Make button" );
buildProjectButton->setPixmap ( SmallIcon ( "make_tdevelop" ) );
- buildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
+ buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
buildProjectButton->setEnabled ( true );
TQToolTip::add( buildProjectButton, i18n( "Build project" ) );
TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>"
@@ -128,7 +128,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// rebuild
rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" );
rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) );
- rebuildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
+ rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
rebuildProjectButton->setEnabled ( true );
TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) );
TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>"
@@ -138,7 +138,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// run
executeProjectButton = new TQToolButton ( projectTools, "Run button" );
executeProjectButton->setPixmap ( SmallIcon ( "exec" ) );
- executeProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
+ executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
executeProjectButton->setEnabled ( true );
TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) );
TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) );
@@ -148,7 +148,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Project configuration
projectconfButton = new TQToolButton ( projectTools, "Project configuration button" );
projectconfButton->setPixmap ( SmallIcon ( "configure" ) );
- projectconfButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
+ projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
projectconfButton->setEnabled ( true );
TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) );
TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently selected subproject. "
@@ -189,7 +189,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
detailContainer = new TQVBox( splitter, "Details" );
detailContainer->setMargin ( 2 );
detailContainer->setSpacing ( 2 );
- // detailContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+ // detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
// Details Toolbar
fileTools = new TQHBox( detailContainer, "Detail buttons" );
@@ -199,7 +199,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Add new file button
newfileButton = new TQToolButton ( fileTools, "Create new file" );
newfileButton->setPixmap ( SmallIcon ( "filenew" ) );
- newfileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
+ newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
newfileButton->setEnabled ( true );
TQToolTip::add( newfileButton, i18n( "Create new file" ) );
TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
@@ -207,7 +207,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Add existing files button
addfilesButton = new TQToolButton ( fileTools, "Add existing files" );
addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) );
- addfilesButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
+ addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
addfilesButton->setEnabled ( true );
TQToolTip::add( addfilesButton, i18n( "Add existing files" ) );
TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
@@ -217,7 +217,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// remove file button
removefileButton = new TQToolButton ( fileTools, "Remove file" );
removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) );
- removefileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
+ removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
removefileButton->setEnabled ( true );
TQToolTip::add( removefileButton, i18n( "Remove file" ) );
TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) );
@@ -225,7 +225,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// build selected file
buildFileButton = new TQToolButton ( fileTools, "Make file button" );
buildFileButton->setPixmap ( SmallIcon ( "compfile" ) );
- buildFileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
+ buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
buildFileButton->setEnabled ( true );
TQToolTip::add( buildFileButton, i18n( "Compile file" ) );
TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>"
@@ -235,7 +235,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// build
buildTargetButton = new TQToolButton ( fileTools, "Make sp button" );
buildTargetButton->setPixmap ( SmallIcon ( "make_tdevelop" ) );
- buildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
+ buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
buildTargetButton->setEnabled ( true );
TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) );
TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. "
@@ -245,7 +245,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// rebuild
rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" );
rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) );
- rebuildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
+ rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
rebuildTargetButton->setEnabled ( true );
TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) );
TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. "
@@ -256,7 +256,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// run
executeTargetButton = new TQToolButton ( fileTools, "Run sp button" );
executeTargetButton->setPixmap ( SmallIcon ( "exec" ) );
- executeTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
+ executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
executeTargetButton->setEnabled ( true );
TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) );
TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. "
@@ -271,7 +271,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// Configure file button
excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" );
excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) );
- excludeFileFromScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
+ excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
excludeFileFromScopeButton->setEnabled ( true );
TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) );
TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) );
@@ -994,72 +994,72 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) )
{
idBuild = popup.insertItem( SmallIcon( "make_tdevelop" ), i18n( "Build" ) );
- popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
+ popup.setWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
"Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab." ) );
idInstall = popup.insertItem( i18n( "Install" ) );
- popup.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
+ popup.setWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
"Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab." ) );
idClean = popup.insertItem( i18n( "Clean" ) );
- popup.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
+ popup.setWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
"directory.<br> Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab." ) );
idDistClean = popup.insertItem( i18n( "Dist-Clean" ) );
- popup.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
+ popup.setWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
"directory.<br> Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab." ) );
idRebuild = popup.insertItem( SmallIcon( "rebuild" ), i18n( "Rebuild" ) );
- popup.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
+ popup.setWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
"the project directory.<br>Environment variables and make arguments can be "
"specified in the project settings dialog, <b>Make Options</b> tab." ) );
idQmake = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake" ) );
- popup.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
+ popup.setWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
idQmakeRecursive = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake recursively" ) );
- popup.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
+ popup.setWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
"subproject directory and recurses into all subproject directories. "
"This creates or regenerates Makefile." ) );
popup.insertSeparator();
idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
- popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
+ popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
"This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be "
"defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idAddSubproject, false );
idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) );
- popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
+ popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
if ( spitem->parent() == NULL )
popup.setItemEnabled( idRemoveSubproject, false );
idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
- popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
+ popup.setWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
popup.insertSeparator();
idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Subproject Settings" ) );
- popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
+ popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
"It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
"external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
}
else
{
idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
- popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) );
+ popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) );
idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) );
- popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
+ popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
popup.insertSeparator();
idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
- popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
+ popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
"This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be "
"defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idAddSubproject, false );
idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) );
- popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
+ popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idDisableSubproject, false );
popup.insertSeparator();
idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) );
- popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
+ popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
"It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
"external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
}
@@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
else if ( r == idBuild )
{
slotBuildTarget();
- // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
+ // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
}
else if ( r == idInstall )
{
slotInstallTarget();
- // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
+ // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
}
else if ( r == idRebuild )
{
@@ -1544,41 +1544,41 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
if ( titem->groupType == GroupItem::InstallRoot )
{
idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) );
- popup.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. "
+ popup.setWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. "
"It is possible to define a list of files to install and installation locations for each object. Warning! "
"Install objects without path specified will not be saved to a project file." ) );
}
else if ( titem->groupType == GroupItem::InstallObject )
{
idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) );
- popup.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
+ popup.setWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) );
- popup.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
+ popup.setWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
"It is possible to use wildcards and relative paths like <i>docs/*</i>." ) );
idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) );
- popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
+ popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
}
else if ( titem->groupType == GroupItem::Translations )
{
idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
- popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
+ popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
- popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
+ popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
"possible to copy files to a current subproject directory, create symbolic links or "
"add them with the relative path." ) );
idLUpdate = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Update Translation Files" ) );
- popup.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
+ popup.setWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
"messages and saves them into translation files." ) );
idLRelease = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Release Binary Translations" ) );
- popup.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
+ popup.setWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
"translation files that are ready to be loaded at program execution." ) );
}
else // File group containing files
{
idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
- popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
+ popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
- popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
+ popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
"possible to copy files to a current subproject directory, create symbolic links or "
"add them with the relative path." ) );
}
@@ -1773,37 +1773,37 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
if ( !fitem->uiFileLink.isEmpty() )
{
idUpdateWidgetclass = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Edit ui-Subclass..." ) );
- popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
+ popup.setWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
"and prompts to implement missing in childclass slots and functions." ) );
}
if ( fitem->text( 0 ).contains( ".ui" ) )
{
idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) );
- popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
+ popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
"It allows to create a subclass from the class defined in .ui file. "
"There is also possibility to implement slots and functions defined in the base class." ) );
if ( !m_part->isTQt4Project() )
{
idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) );
- popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
+ popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
}
idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) );
- popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
+ popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
"There is possibility to add or remove subclasses from the list." ) );
}
if ( !( gitem->groupType == GroupItem::InstallObject ) )
{
idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) );
- popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
+ popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) );
- popup.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
+ popup.setWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
}
else
{
idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) );
- popup.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
+ popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) );
- popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
+ popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
}
if ( !( gitem->groupType == GroupItem::InstallObject ) )
{
@@ -1815,7 +1815,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
if ( gitem->groupType == GroupItem::Sources )
{
idBuildFile = popup.insertItem( SmallIconSet( "make_tdevelop" ), i18n( "Build File" ) );
- popup.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
+ popup.setWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
}
int r = popup.exec( p );
diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui
index 7ac003f4..c23e3941 100644
--- a/buildtools/script/scriptoptionswidgetbase.ui
+++ b/buildtools/script/scriptoptionswidgetbase.ui
@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui
index a5862a50..3c395ce7 100644
--- a/editors/editor-chooser/editchooser.ui
+++ b/editors/editor-chooser/editchooser.ui
@@ -102,7 +102,7 @@ already open files.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/embedded/visualboyadvance/vbaconfigwidgetbase.ui b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
index d2ca54cb..812657ac 100644
--- a/embedded/visualboyadvance/vbaconfigwidgetbase.ui
+++ b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
@@ -125,7 +125,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>0</height>
@@ -147,7 +147,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui
index 7034bca4..970a19e5 100644
--- a/kdevdesigner/designer/about.ui
+++ b/kdevdesigner/designer/about.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 9eb97cbd..97e27877 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -140,7 +140,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB
setOrientation( o );
setBackgroundMode( parent->backgroundMode() );
setBackgroundOrigin( ParentOrigin );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
}
void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
@@ -153,9 +153,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient );
}
-TQSize QDesignerToolBarSeparator::tqsizeHint() const
+TQSize QDesignerToolBarSeparator::sizeHint() const
{
- int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+ int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
if ( orient ==Qt::Horizontal )
return TQSize( extent, 0 );
@@ -172,7 +172,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 5e830949..0050ace8 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -160,7 +160,7 @@ class QDesignerToolBarSeparator : public TQWidget
public:
QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
Qt::Orientation orientation() const { return orient; }
public slots:
void setOrientation( Qt::Orientation );
diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui
index 38d1f966..c2c5988c 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/kdevdesigner/designer/actioneditor.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 60a14cdf..f66ab073 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -271,8 +271,8 @@ void InsertCommand::execute()
widget->move( tqgeometry.topLeft() );
widget->adjustSize();
} else {
- TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
- s = s.expandedTo( widget->tqminimumSizeHint() );
+ TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() );
+ s = s.expandedTo( widget->minimumSizeHint() );
TQRect r( tqgeometry.topLeft(), s );
widget->setGeometry( r );
}
@@ -490,7 +490,7 @@ bool SetPropertyCommand::canMerge( Command *c )
if ( !widget )
return FALSE;
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) {
if ( propName == "toolTip" || propName == "whatsThis" )
return TRUE;
@@ -563,16 +563,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
if ( select )
editor->propertyList()->setCurrentProperty( propName );
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) {
if ( propName == "hAlign" ) {
- p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
int align = widget->property( "tqalignment" ).toInt();
align &= ~( AlignHorizontal_Mask );
align |= p->keyToValue( currentItemText );
widget->setProperty( "tqalignment", TQVariant( align ) );
} else if ( propName == "vAlign" ) {
- p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
int align = widget->property( "tqalignment" ).toInt();
align &= ~( AlignVertical_Mask );
align |= p->keyToValue( currentItemText );
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui
index 05a1e52f..226cdd35 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/kdevdesigner/designer/configtoolboxdialog.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>342</width>
<height>0</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>0</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>0</height>
diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui
index cfc590a5..51995633 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/kdevdesigner/designer/connectiondialog.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index d43bb874..edc11423 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw )
void SignalItem::senderChanged( TQObject *sender )
{
- TQStrList sigs = sender->tqmetaObject()->signalNames( TRUE );
+ TQStrList sigs = sender->metaObject()->signalNames( TRUE );
sigs.remove( "destroyed()" );
sigs.remove( "destroyed(TQObject*)" );
sigs.remove( "accessibilityChanged(int)" );
@@ -441,15 +441,15 @@ void SlotItem::updateSlotList()
}
TQString signal = MetaDataBase::normalizeFunction( lastSignal );
- int n = lastReceiver->tqmetaObject()->numSlots( TRUE );
+ int n = lastReceiver->metaObject()->numSlots( TRUE );
TQStringList slts;
for( int i = 0; i < n; ++i ) {
// accept only public slots. For the form window, also accept protected slots
- const TQMetaData* md = lastReceiver->tqmetaObject()->slot( i, TRUE );
- if ( ( (lastReceiver->tqmetaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
+ const TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE );
+ if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
(formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) &&
- lastReceiver->tqmetaObject()->slot(i, TRUE)->tqt_mo_access ==
+ lastReceiver->metaObject()->slot(i, TRUE)->tqt_mo_access ==
TQMetaData::Protected) ) &&
!ignoreSlot( md->tqt_mo_ci_name ) &&
checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) )
diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index 60f6a3b6..e03340b1 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 7ba5dd29..e6e7553f 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -246,7 +246,7 @@
<property name="name">
<cstring>buttonChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -293,7 +293,7 @@
<property name="name">
<cstring>buttonChooseHeader</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -527,7 +527,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -600,7 +600,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -814,7 +814,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -900,7 +900,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index d2d0f5b5..f5346ed3 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -199,8 +199,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
previewPixmap->setPixmap( *w->pixmap );
else
previewPixmap->setText( "" );
- spinWidth->setValue( w->tqsizeHint.width() );
- spinHeight->setValue( w->tqsizeHint.height() );
+ spinWidth->setValue( w->sizeHint.width() );
+ spinHeight->setValue( w->sizeHint.height() );
sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
checkContainer->setChecked( w->isContainer );
@@ -310,7 +310,7 @@ void CustomWidgetEditor::heightChanged( int h )
if ( !i || !w )
return;
- w->tqsizeHint.setHeight( h );
+ w->sizeHint.setHeight( h );
updateCustomWidgetSizes();
}
@@ -354,7 +354,7 @@ void CustomWidgetEditor::widthChanged( int wid )
if ( !i || !w )
return;
- w->tqsizeHint.setWidth( wid );
+ w->sizeHint.setWidth( wid );
updateCustomWidgetSizes();
}
@@ -710,8 +710,8 @@ void CustomWidgetEditor::saveDescription()
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent2( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
- ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+ ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+ ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent2( indent ) << "</sizehint>" << endl;
ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -802,7 +802,7 @@ void CustomWidgetEditor::horDataChanged( int a )
CustomWidget *cw = (CustomWidget*)o;
if ( cw->realClassName() == boxWidgets->currentText() ) {
if ( cw->sizePolicy() == osp )
- cw->tqsetSizePolicy( w->sizePolicy );
+ cw->setSizePolicy( w->sizePolicy );
}
}
}
@@ -823,7 +823,7 @@ void CustomWidgetEditor::verDataChanged( int a )
CustomWidget *cw = (CustomWidget*)o;
if ( cw->realClassName() == boxWidgets->currentText() ) {
if ( cw->sizePolicy() == osp )
- cw->tqsetSizePolicy( w->sizePolicy );
+ cw->setSizePolicy( w->sizePolicy );
}
}
}
diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui
index abf8beed..40ef0a9b 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/kdevdesigner/designer/dbconnectioneditor.ui
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui
index e373b2be..64cc65c1 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/kdevdesigner/designer/dbconnections.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -237,7 +237,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -256,7 +256,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp
index ebe10a70..22d1e531 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/kdevdesigner/designer/designerapp.cpp
@@ -48,7 +48,7 @@ void set_splash_status( const TQString &txt )
if ( !splash )
return;
TQString splashText = "Licensed to "
- + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
+ + TQString::fromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
+ txt;
splash->message( splashText, TQt::AlignRight|TQt::AlignTop );
}
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index cfafb4e9..57ee992e 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr
void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value )
{
- int id = o->tqmetaObject()->findProperty( property, TRUE );
- const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
+ int id = o->metaObject()->findProperty( property, TRUE );
+ const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
if ( p && p->isValid() )
o->setProperty( property, value );
else
@@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con
TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const
{
- int id = o->tqmetaObject()->findProperty( prop, TRUE );
- const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
+ int id = o->metaObject()->findProperty( prop, TRUE );
+ const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
if ( p && p->isValid() )
return o->property( prop );
return MetaDataBase::fakeProperty( o, prop );
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index 1119282a..e530a31a 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -354,7 +354,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -518,7 +518,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -566,7 +566,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui
index f806a3aa..9b16cd8c 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/kdevdesigner/designer/finddialog.ui
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index 93486243..08b4bd1e 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -77,7 +77,7 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name
if ( !temp )
checkFileName( FALSE );
- connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewtqStatus(FormFile* )));
+ connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* )));
}
FormFile::~FormFile()
@@ -899,7 +899,7 @@ void FormFile::notifyFormWindowChange()
pro->formOpened( fw );
}
-void FormFile::emitNewtqStatus(FormFile *file)
+void FormFile::emitNewStatus(FormFile *file)
{
- fw->mainWindow()->part()->emitNewtqStatus(fileName(), isModified());
+ fw->mainWindow()->part()->emitNewStatus(fileName(), isModified());
}
diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h
index 097beff4..f6d71a26 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/kdevdesigner/designer/formfile.h
@@ -116,7 +116,7 @@ signals:
private slots:
void formWindowChangedSomehow();
void notifyFormWindowChange();
- void emitNewtqStatus(FormFile* file);
+ void emitNewStatus(FormFile* file);
private:
bool isFormWindowModified() const;
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index fbd7e1ad..7da756de 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -260,7 +260,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
if( !TQPixmapCache::find( grid_name, grid ) ) {
grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
- grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
+ grid.fill( colorGroup().color( TQColorGroup::Foreground ) );
TQBitmap mask( grid.width(), grid.height() );
mask.fill( color0 );
TQPainter p( &mask );
@@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p )
void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text )
{
unclippedPainter->save();
- unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1 ));
+ unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1 ));
unclippedPainter->setRasterOp( CopyROP );
if ( !sizePreviewPixmap.isNull() )
unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap );
@@ -416,8 +416,8 @@ void FormWindow::insertWidget()
r.setHeight( 20 );
}
} else {
- r.setWidth( w->tqsizeHint().width() );
- r.setHeight( w->tqsizeHint().height() );
+ r.setWidth( w->sizeHint().width() );
+ r.setHeight( w->sizeHint().height() );
}
}
@@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
targetContainer = wa;
hadOwnPalette = wa->ownPalette();
restorePalette = wa->palette();
- wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() );
+ wa->setPaletteBackgroundColor( wa->colorGroup().midlight() );
}
}
else if ( targetContainer ) {
@@ -1910,11 +1910,11 @@ void FormWindow::checkAccels()
insertedWidgets[ (void*)o ] ) {
TQWidget *w = (TQWidget*)o;
const TQMetaProperty* text =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
const TQMetaProperty* title =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
const TQMetaProperty* pageTitle =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
if ( text )
find_accel( w->property( "text" ).toString(), accels, w );
if ( title )
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui
index 28c1005e..99df35d2 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/kdevdesigner/designer/gotolinedialog.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui
index 369fdb67..8711bd6b 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/kdevdesigner/designer/iconvieweditor.ui
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -179,7 +179,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -229,7 +229,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -252,7 +252,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index bb0f2955..991a1b7c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName)
emit editSource(designerType(), formName);
}
-void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status)
+void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
{
- emit newtqStatus(formName, status);
+ emit newStatus(formName, status);
}
void KDevDesignerPart::toolsEditCustomWidgets( )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 5d402856..4a98f1a7 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -61,7 +61,7 @@ public:
void emitEditFunction(const TQString &formName, const TQString &functionName);
void emitEditSource(const TQString &formName);
- void emitNewtqStatus(const TQString &formName, int status);
+ void emitNewStatus(const TQString &formName, int status);
protected:
virtual bool openFile();
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index f908dd4b..33a6877b 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -936,15 +936,15 @@ void Spacer::setSizeType( SizeType t )
sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
else
sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
- tqsetSizePolicy( sizeP );
+ setSizePolicy( sizeP );
}
Spacer::SizeType Spacer::sizeType() const
{
if ( orient ==Qt::Vertical )
- return (SizeType)tqsizePolicy().verData();
- return (SizeType)tqsizePolicy().horData();
+ return (SizeType)sizePolicy().verData();
+ return (SizeType)sizePolicy().horData();
}
int Spacer::tqalignment() const
@@ -954,7 +954,7 @@ int Spacer::tqalignment() const
return AlignVCenter;
}
-TQSize Spacer::tqminimumSize() const
+TQSize Spacer::minimumSize() const
{
TQSize s = TQSize( 20,20 );
if ( sizeType() == Expanding )
@@ -965,7 +965,7 @@ TQSize Spacer::tqminimumSize() const
return s;
}
-TQSize Spacer::tqsizeHint() const
+TQSize Spacer::sizeHint() const
{
return sh;
}
@@ -975,7 +975,7 @@ void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
- resize( tqsizeHint() );
+ resize( sizeHint() );
updateGeometry();
}
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index d71368ab..47b1ca00 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -125,7 +125,7 @@ class Spacer : public TQWidget
TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
Q_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
- TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+ TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
private:
@@ -142,8 +142,8 @@ public:
Spacer( TQWidget *parent, const char *name );
- TQSize tqminimumSize() const;
- TQSize tqsizeHint() const;
+ TQSize minimumSize() const;
+ TQSize sizeHint() const;
void setSizeType( SizeType t );
SizeType sizeType() const;
int tqalignment() const;
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 920559c5..54498478 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -152,8 +152,8 @@ void ListBoxDnd::updateLine( const TQPoint & dragPos )
TQListBoxItem *item = itemAt( dragPos );
int ypos = item ?
- ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) :
- ( src->tqitemRect( ((TQListBox *)src)->firstItem() ).top() );
+ ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) :
+ ( src->itemRect( ((TQListBox *)src)->firstItem() ).top() );
line->resize( src->viewport()->width(), line->height() );
line->move( 0, ypos );
@@ -166,9 +166,9 @@ TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos )
TQListBoxItem * last = src->item( src->count() - 1 );
int i = src->index( result );
- if ( result && ( pos.y() < (src->tqitemRect(result).top() + src->itemHeight(i)/2) ) )
+ if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) )
result = result->prev();
- else if ( !result && pos.y() > src->tqitemRect( last ).bottom() )
+ else if ( !result && pos.y() > src->itemRect( last ).bottom() )
result = last;
return result;
@@ -240,7 +240,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
{
- TQByteArray data = event->tqencodedData( "qt/listboxitem" );
+ TQByteArray data = event->encodedData( "qt/listboxitem" );
if ( data.size() ) {
event->accept();
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index 2827c93d..df584ddf 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -196,7 +196,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -219,7 +219,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -250,7 +250,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -303,7 +303,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp
index 53f0deea..0a32d292 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/kdevdesigner/designer/listboxrename.cpp
@@ -113,7 +113,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
case TQEvent::Resize:
if ( clickedItem && ed && !ed->isHidden() ) {
- TQRect rect = src->tqitemRect( clickedItem );
+ TQRect rect = src->itemRect( clickedItem );
ed->resize( rect.right() - rect.left() - 1,
rect.bottom() - rect.top() - 1 );
}
@@ -130,7 +130,7 @@ void ListBoxRename::showLineEdit()
{
if ( !clickedItem || activity )
return;
- TQRect rect = src->tqitemRect( clickedItem );
+ TQRect rect = src->itemRect( clickedItem );
ed->resize( rect.right() - rect.left() - 1,
rect.bottom() - rect.top() - 1 );
ed->move( rect.left() + 1, rect.top() + 1 );
diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index 30b766a0..c477ff1a 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index 953551df..9a9a59e6 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -191,8 +191,8 @@ void ListViewDnd::updateLine( const TQPoint & dragPos )
TQListView * src = (TQListView *) this->src;
int ypos = item ?
- ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) :
- ( src->tqitemRect( src->firstChild() ).top() );
+ ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) :
+ ( src->itemRect( src->firstChild() ).top() );
int xpos = dropDepth( item, dragPos ) * src->treeStepSize();
line->resize( src->viewport()->width() - xpos, line->height() );
@@ -217,7 +217,7 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
while ( result && !result->isVisible() && result->parent() )
result = result->parent();
- if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) {
+ if ( !result && src->firstChild() && (pos.y() > src->itemRect(src->firstChild()).bottom()) ) {
result = src->lastItem();
if ( !result->isVisible() )
// Handle special case where last item is actually hidden
@@ -284,7 +284,7 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
{
- TQByteArray data = event->tqencodedData( "qt/listviewitem" );
+ TQByteArray data = event->encodedData( "qt/listviewitem" );
TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
// Change from sibling (default) to child creation
diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui
index e2f3447f..8a0abe14 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/kdevdesigner/designer/listvieweditor.ui
@@ -142,7 +142,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -203,7 +203,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -226,7 +226,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -292,7 +292,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -426,7 +426,7 @@
<property name="name">
<cstring>colDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -449,7 +449,7 @@
<property name="name">
<cstring>colChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -480,7 +480,7 @@
<property name="name">
<cstring>colText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -597,7 +597,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index dbc2b932..e337efb6 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -537,7 +537,7 @@ int MainWindow::currentTool() const
{
if ( !actionCurrentTool )
return POINTER_TOOL;
- return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+ return TQString::fromLatin1(actionCurrentTool->name()).toInt();
}
void MainWindow::runProjectPrecondition()
@@ -735,14 +735,14 @@ void MainWindow::previewForm( const TQString & style )
void MainWindow::helpContents()
{
- TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+ TQWidget *focusWidget = tqApp->focusWidget();
bool showClassDocu = TRUE;
- while ( tqfocusWidget ) {
- if ( tqfocusWidget->isA( "PropertyList" ) ) {
+ while ( focusWidget ) {
+ if ( focusWidget->isA( "PropertyList" ) ) {
showClassDocu = FALSE;
break;
}
- tqfocusWidget = tqfocusWidget->parentWidget();
+ focusWidget = focusWidget->parentWidget();
}
TQString source = "designer-manual.html";
@@ -767,7 +767,7 @@ void MainWindow::helpContents()
if ( propertyEditor->widget() && !showClassDocu ) {
if ( !propertyEditor->currentProperty().isEmpty() ) {
- TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
+ TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty();
TQString s;
TQString cp = propertyEditor->currentProperty();
if ( cp == "layoutMargin" ) {
@@ -783,7 +783,7 @@ void MainWindow::helpContents()
source = propertyDocumentation[ "TQObject/name" ];
} else {
while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
if ( mo )
source = "p:" + propertyDocumentation[s];
}
@@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
{
- const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
+ const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
text = 0;
- const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
title = 0;
const TQMetaProperty* pagetitle =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
pagetitle = 0;
const TQMetaProperty* pixmap =
- w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE );
+ w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
pixmap = 0;
@@ -2211,8 +2211,8 @@ void MainWindow::writeConfig()
l << w->className;
l << w->includeFile;
l << TQString::number( (int)w->includePolicy );
- l << TQString::number( w->tqsizeHint.width() );
- l << TQString::number( w->tqsizeHint.height() );
+ l << TQString::number( w->sizeHint.width() );
+ l << TQString::number( w->sizeHint.height() );
l << TQString::number( w->lstSignals.count() );
for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
l << TQString( fixArgs( *it ) );
@@ -2351,8 +2351,8 @@ void MainWindow::readConfig()
w->className = l[ 0 ];
w->includeFile = l[ 1 ];
w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
- w->tqsizeHint.setWidth( l[ 3 ].toInt() );
- w->tqsizeHint.setHeight( l[ 4 ].toInt() );
+ w->sizeHint.setWidth( l[ 3 ].toInt() );
+ w->sizeHint.setHeight( l[ 4 ].toInt() );
uint c = 5;
if ( l.count() > c ) {
int numSignals = l[ c ].toInt();
@@ -2617,8 +2617,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
return TRUE;
}
- const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
- const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+ const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+ const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
if ( text && text->designable(w) ) {
bool ok = FALSE;
bool oldDoWrap = FALSE;
@@ -2856,7 +2856,7 @@ void MainWindow::checkTempFiles()
void MainWindow::showDialogHelp()
{
TQWidget *w = (TQWidget*)sender();
- w = w->tqtopLevelWidget();
+ w = w->topLevelWidget();
TQString link = documentationPath() + "/designer-manual-13.html#";
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index e7ba30f3..484b0aec 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1921,7 +1921,7 @@ void MainWindow::editPreferences()
setUsesTextLabel( dia->checkBoxTextLabels->isChecked() );
if (dia->textEditPluginPaths->isModified()) {
pluginPaths = dia->textEditPluginPaths->text();
- TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths));
+ TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths));
savePluginPaths = TRUE;
}
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 498c6827..550c9b60 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -74,7 +74,7 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
{
- TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" );
+ TQByteArray data = e->encodedData( "qt/menubareditoritemptr" );
TQDataStream stream( data, IO_ReadOnly );
if ( !data.size() )
@@ -502,7 +502,7 @@ void MenuBarEditor::deleteItem( int index )
}
}
-TQSize MenuBarEditor::tqsizeHint() const
+TQSize MenuBarEditor::sizeHint() const
{
return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
}
@@ -576,7 +576,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
lineEdit->hide();
update();
} else if ( e->type() == TQEvent::LayoutHint ) {
- resize( tqsizeHint() );
+ resize( sizeHint() );
}
return TQMenuBar::eventFilter( o, e );
}
@@ -586,7 +586,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
TQPainter p( this );
TQRect r = rect();
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
- r, tqcolorGroup() );
+ r, colorGroup() );
drawItems( p );
}
@@ -817,7 +817,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
{
- TQWidget * fw = tqApp->tqfocusWidget();
+ TQWidget * fw = tqApp->focusWidget();
if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) )
hideItem();
update();
@@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p )
TQPoint pos( borderSize(), 0 );
uint c = 0;
- p.setPen( tqcolorGroup().buttonText() );
+ p.setPen( colorGroup().buttonText() );
MenuBarEditorItem * i = itemList.first();
while ( i ) {
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index 0725fd5f..ec933d0b 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -120,9 +120,9 @@ public:
void focusItem( int index = -1 );
void deleteItem( int index = -1 );
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const { return tqsizeHint(); }
- TQSize tqminimumSizeHint() const { return tqsizeHint(); }
+ TQSize sizeHint() const;
+ TQSize minimumSize() const { return sizeHint(); }
+ TQSize minimumSizeHint() const { return sizeHint(); }
int heightForWidth( int max_width ) const;
void show();
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 5f8ce367..ffd736c4 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -652,8 +652,8 @@ void MetaDataBase::doConnections( TQObject *o )
TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+ TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+ TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
// avoid warnings
if ( signalList.find( conn.signal ) == -1 ||
@@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
}
if ( !onlyCustom ) {
- TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
+ TQStrList slotList = o->metaObject()->slotNames( TRUE );
if ( slotList.find( slot ) != -1 )
return TRUE;
if ( ::tqqt_cast<FormWindow*>(o) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- slotList = o->tqmetaObject()->slotNames( TRUE );
+ slotList = o->metaObject()->slotNames( TRUE );
if ( slotList.find( slot ) != -1 )
return TRUE;
}
@@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
}
if ( !onlyCustom ) {
- TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
+ TQStrList functionList = o->metaObject()->slotNames( TRUE );
if ( functionList.find( function ) != -1 )
return TRUE;
if ( ::tqqt_cast<FormWindow*>(o) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- functionList = o->tqmetaObject()->slotNames( TRUE );
+ functionList = o->metaObject()->slotNames( TRUE );
if ( functionList.find( function ) != -1 )
return TRUE;
}
@@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget";
includeFile = "mywidget.h";
includePolicy = Local;
- tqsizeHint = TQSize( -1, -1 );
+ sizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1354,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
{
- TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
+ TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
if ( sigList.find( signal ) != -1 )
return TRUE;
for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
{
- TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
+ TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
if ( slotList.find( normalizeFunction( slot ) ) != -1 )
return TRUE;
@@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
{
- TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
+ TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
if ( propList.find( prop ) != -1 )
return TRUE;
diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h
index 9b00deb9..352e10d7 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/kdevdesigner/designer/metadatabase.h
@@ -102,7 +102,7 @@ public:
TQString className;
TQString includeFile;
IncludePolicy includePolicy;
- TQSize tqsizeHint;
+ TQSize sizeHint;
TQSizePolicy sizePolicy;
TQPixmap *pixmap;
TQValueList<TQCString> lstSignals;
diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui
index 1fe1ea63..f0ff2129 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/kdevdesigner/designer/multilineeditor.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 166ab877..46ec8097 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -231,8 +231,8 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
mlined = (TQTextEdit*)editWidget;
mlined->setReadOnly( TRUE );
- const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property(
- mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE );
+ const TQMetaProperty *wordWrap = mlined->metaObject()->property(
+ mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE );
oldWrapMode = 0;
oldWrapString = "NoWrap";
if ( wordWrap ) {
@@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
if ( oldWrapString != "NoWrap" )
doWrap = TRUE;
}
- textEdit->tqsetAlignment( mlined->tqalignment() );
+ textEdit->setAlignment( mlined->tqalignment() );
textEdit->setWordWrap( mlined->wordWrap() );
textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
textEdit->setWrapPolicy( mlined->wrapPolicy() );
diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui
index 3fcbd914..81cb4fa5 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/kdevdesigner/designer/newform.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui
index 79e04792..607c52fb 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/kdevdesigner/designer/paletteeditor.ui
@@ -92,7 +92,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -150,7 +150,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -343,7 +343,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui
index a8ba6c03..579f0e68 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/kdevdesigner/designer/paletteeditoradvanced.ui
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -323,7 +323,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -473,7 +473,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -490,7 +490,7 @@
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -565,7 +565,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 1da0557b..92410960 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -71,7 +71,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
{
- p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
+ p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
p->drawPixmap( 0, 0, pixmap );
}
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui
index a6ed1bd6..30f74183 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index e5f13817..760abe56 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -877,7 +877,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 7770dcda..c9575f23 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -80,7 +80,7 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i )
{
- TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" );
+ TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" );
TQDataStream stream( data, IO_ReadOnly );
if ( !data.size() )
@@ -170,7 +170,7 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
void PopupMenuEditorItem::setVisible( bool enable )
{
if ( a )
- a->tqsetVisible( enable );
+ a->setVisible( enable );
}
bool PopupMenuEditorItem::isVisible() const
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
reg -= mid;
p.setClipRegion( reg );
- tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
p.restore();
drawItems( &p );
}
@@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
{
- TQWidget * fw = tqApp->tqfocusWidget();
+ TQWidget * fw = tqApp->focusWidget();
if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
hideSubMenu();
if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
@@ -1031,12 +1031,12 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
int y = r.y();
int h = r.height();
- p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
+ p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
if ( i->isSeparator() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
TQRect( r.x(), r.y() + 2, r.width(), 1 ),
- tqcolorGroup(), TQStyle::Style_Sunken | f );
+ colorGroup(), TQStyle::Style_Sunken | f );
return;
}
@@ -1044,7 +1044,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
if ( a->isToggleAction() && a->isOn() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
TQRect( x , y, iconWidth, h ),
- tqcolorGroup(), f );
+ colorGroup(), f );
} else {
TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal );
p->drawPixmap( x + ( iconWidth - icon.width() ) / 2,
@@ -1066,7 +1066,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
if ( i->count() ) // Item has submenu
tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
- tqcolorGroup(), f );
+ colorGroup(), f );
}
void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const
@@ -1092,7 +1092,7 @@ void PopupMenuEditor::drawItems( TQPainter * p )
int flags = 0;
int idx = 0;
- TQColorGroup enabled = tqcolorGroup();
+ TQColorGroup enabled = colorGroup();
TQColorGroup disabled = tqpalette().disabled();
TQRect focus;
TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index a4335bc7..1b0aefaa 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -519,7 +519,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index c63e994f..c26d51fc 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -37,7 +37,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
setLineWidth(1);
PreviewWorkspace * w = new PreviewWorkspace( this );
- w->setEraseColor(tqcolorGroup().dark());
+ w->setEraseColor(colorGroup().dark());
previewWidget = new PreviewWidget( w );
previewWidget->move( 10, 10 );
}
diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index 0cc680c8..3b792253 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -259,7 +259,7 @@
<property name="name">
<cstring>textView</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -288,7 +288,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index 486ce960..4ac40534 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>71</height>
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 01a2bb9f..37bbc596 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
resetButton = new TQPushButton( hbox );
setupStyle( resetButton );
resetButton->setPixmap( DesignerResetPix );
- resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
- hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+ resetButton->setFixedWidth( resetButton->sizeHint().width() );
+ hbox->tqlayout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState()
void PropertyItem::placeEditor( TQWidget *w )
{
createResetButton();
- TQRect r = listview->tqitemRect( this );
+ TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
#if defined(TQ_WS_WIN)
listview->repaintContents( FALSE );
#endif
- r = listview->tqitemRect( this );
+ r = listview->itemRect( this );
}
r.setX( listview->header()->sectionPos( 1 ) );
r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,7 +455,7 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
- resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+ resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
}
@@ -553,10 +553,10 @@ TQString PropertyItem::currentItemFromObject() const
void PropertyItem::setFocus( TQWidget *w )
{
- if ( !tqApp->tqfocusWidget() ||
+ if ( !tqApp->focusWidget() ||
listview->propertyEditor()->formWindow() &&
- ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
- !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+ ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+ !tqApp->focusWidget()->inherits( "Editor" ) ) )
w->setFocus();
}
@@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
box = new TQHBox( listview->viewport() );
box->hide();
pixPrev = new TQLabel( box );
- pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
- pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+ pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
+ pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
button = new TQPushButton( "...", box );
setupStyle( button );
button->setFixedWidth( 20 );
@@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
if ( !pix.isNull() ) {
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
p->restore();
@@ -2311,7 +2311,7 @@ void PropertyPaletteItem::getPalette()
w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
#if defined(TQT_NON_COMMERCIAL)
- w->backgroundMode(), listview->tqtopLevelWidget(),
+ w->backgroundMode(), listview->topLevelWidget(),
#else
w->backgroundMode(), listview,
#endif
@@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
{
TQPalette pal( value().toPalette() );
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
TQRect r2( r );
r2.setX( r2.x() + 2 );
@@ -2678,7 +2678,7 @@ void EnumBox::popupClosed()
void EnumBox::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -2692,7 +2692,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
&g.brush( TQColorGroup::Button ) );
return;
}
- tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+ tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(arrowDown ?
TQStyle::SC_ComboBoxArrow :
@@ -2700,7 +2700,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
- re = TQStyle::tqvisualRect(re, this);
+ re = TQStyle::visualRect(re, this);
p.setClipRect( re );
if ( !str.isNull() ) {
@@ -2744,7 +2744,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) );
@@ -3040,7 +3040,7 @@ void PropertyList::setupProperties()
if ( !editor->widget() )
return;
bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
- TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+ TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
PropertyItem *item = 0;
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
@@ -3051,11 +3051,11 @@ void PropertyList::setupProperties()
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
if ( !p )
continue;
- if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+ if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
continue;
if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) ||
::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
@@ -3071,12 +3071,12 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
}
- unique.insert( TQString::tqfromLatin1( it.current() ), TRUE );
+ unique.insert( TQString::fromLatin1( it.current() ), TRUE );
if ( editor->widget()->isWidgetType() &&
editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -3107,9 +3107,9 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "geometry" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
if ( qstrcmp( p->name(), "enabled" ) == 0 )
continue;
@@ -3692,21 +3692,21 @@ static void clearAlignList( TQStrList &l )
void PropertyList::setPropertyValue( PropertyItem *i )
{
const TQMetaProperty *p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
if ( !p ) {
if ( i->name() == "hAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
align &= ~AlignVertical_Mask;
TQStrList l = p->valueToKeys( align );
clearAlignList( l );
( (PropertyListItem*)i )->setCurrentItem( l.last() );
} else if ( i->name() == "vAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
align &= ~AlignHorizontal_Mask;
( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
} else if ( i->name() == "wordwrap" ) {
@@ -3864,7 +3864,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( (PropertyItem*)i )->propertyParent() )
i = ( (PropertyItem*)i )->propertyParent();
- const TQMetaObject *mo = editor->widget()->tqmetaObject();
+ const TQMetaObject *mo = editor->widget()->metaObject();
TQString prop = ( (PropertyItem*)i )->name();
while ( mo ) {
TQString s;
@@ -3873,7 +3873,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
return *it;
}
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
@@ -4274,21 +4274,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
return TQString();
TQObject *o = wid;
TQString curr = currentProperty();
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
while ( mo ) {
TQStrList props = mo->propertyNames( FALSE );
if ( props.find( curr.latin1() ) != -1 )
return mo->className();
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return TQString();
}
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
{
if ( !wid )
return 0;
- return wid->tqmetaObject();
+ return wid->metaObject();
}
void PropertyEditor::resetFocus()
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index 1b0fcc85..0191aab6 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -789,7 +789,7 @@ public:
TQString currentProperty() const;
TQString classOfCurrentProperty() const;
- TQMetaObject* tqmetaObjectOfCurrentProperty() const;
+ TQMetaObject* metaObjectOfCurrentProperty() const;
void resetFocus();
diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp
index 39d23b48..1bd1883f 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/kdevdesigner/designer/propertyobject.cpp
@@ -39,11 +39,11 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
v.setAutoDelete( TRUE );
for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
- const TQMetaObject *m = o->tqmetaObject();
+ const TQMetaObject *m = o->metaObject();
TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>;
while ( m ) {
mol->insert( 0, m );
- m = m->tqsuperClass();
+ m = m->superClass();
}
v.insert( v.count(), mol );
}
diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h
index 4cfb54fd..2590399a 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/kdevdesigner/designer/propertyobject.h
@@ -8,7 +8,7 @@
class PropertyObject : public TQObject
{
public:
- TQMetaObject *tqmetaObject() const { return (TQMetaObject*)mobj; }
+ TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; }
const char *className() const { return "PropertyObject"; }
TQObject* qObject() { return (TQObject*)this; }
private:
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index 7407370c..ed0c986e 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -88,8 +88,8 @@ void QCompletionEdit::placeListBox()
return;
}
- popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
- listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+ popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+ listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui
index 635b2315..27d01a58 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/kdevdesigner/designer/replacedialog.ui
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 0d83cb1e..7ad33a50 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -625,10 +625,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
if ( formwindow->tqlayout() )
formwindow->tqlayout()->activate();
if ( hadGeometry )
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
- expandedTo( formwindow->tqminimumSizeHint() ) ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
+ expandedTo( formwindow->minimumSizeHint() ) ) );
else
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
}
return TRUE;
@@ -1054,14 +1054,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget;
cw->className = className;
cw->includeFile = WidgetDatabase::includeFile( classID );
- TQStrList lst = w->tqmetaObject()->signalNames( TRUE );
+ TQStrList lst = w->metaObject()->signalNames( TRUE );
for ( TQPtrListIterator<char> it(lst); it.current(); ++it )
cw->lstSignals.append(it.current());
int i;
- int total = w->tqmetaObject()->numProperties( TRUE );
+ int total = w->metaObject()->numProperties( TRUE );
for ( i = 0; i < total; i++ ) {
- const TQMetaProperty *p = w->tqmetaObject()->property( i, TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( i, TRUE );
if ( p->designable(w) ) {
MetaDataBase::Property prop;
prop.property = p->name();
@@ -1079,9 +1079,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
}
}
- total = w->tqmetaObject()->numSlots( TRUE );
+ total = w->metaObject()->numSlots( TRUE );
for ( i = 0; i < total; i++ ) {
- const TQMetaData *md = w->tqmetaObject()->slot( i, TRUE );
+ const TQMetaData *md = w->metaObject()->slot( i, TRUE );
MetaDataBase::Function funky;
// Find out if we have a return type.
if ( md->method->count > 0 ) {
@@ -1399,8 +1399,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
changed = MetaDataBase::changedProperties( w );
if ( w->isWidgetType() ) {
if ( ::tqqt_cast<Spacer*>(w) ) {
- if ( !changed.contains( "tqsizeHint" ) )
- changed << "tqsizeHint";
+ if ( !changed.contains( "sizeHint" ) )
+ changed << "sizeHint";
if ( !changed.contains( "geometry" ) )
changed << "geometry";
} else {
@@ -1432,15 +1432,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
- TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
+ TQStrList lst = w->metaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
+ if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
continue;
- if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
+ if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
continue;
- saved << TQString::tqfromLatin1( it.current() );
- const TQMetaProperty* p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE );
+ saved << TQString::fromLatin1( it.current() );
+ const TQMetaProperty* p = w->metaObject()->
+ property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE );
if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
continue;
if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
@@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
TQString v;
for ( uint i = 0; i < l.count(); ++i ) {
@@ -1509,7 +1509,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
}
@@ -2143,7 +2143,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
*/
void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE );
if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
@@ -2591,8 +2591,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
- ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+ ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+ ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2648,9 +2648,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
TQDomElement n3 = n2.firstChild().toElement();
while ( !n3.isNull() ) {
if ( n3.tagName() == "width" )
- w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
else if ( n3.tagName() == "height" )
- w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
n3 = n3.nextSibling().toElement();
}
} else if ( n2.tagName() == "sizepolicy" ) {
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui
index 0eaef760..d7d6c5a7 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/kdevdesigner/designer/richtextfontdialog.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -195,7 +195,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -272,7 +272,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index 6ba2ba3f..5a9ae0e9 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -241,9 +241,9 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 2 * formWindow->grid().x() );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 2 * formWindow->grid().y() );
if ( TQMAX( minw, width ) > w->maximumWidth() ||
TQMAX( minh, height ) > w->maximumHeight() )
@@ -257,9 +257,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh
void SizeHandle::tryResize( TQWidget *w, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 16 );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 16 );
w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
}
diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui
index 8843ba87..383fdfda 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/kdevdesigner/designer/startdialog.ui
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index d2aea25f..351ab247 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -41,7 +41,7 @@
StyledButton::StyledButton(TQWidget* parent, const char* name)
: TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
{
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
setAcceptDrops( TRUE );
connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -54,7 +54,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
{
col = b.color();
pix = b.pixmap();
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
}
StyledButton::~StyledButton()
@@ -117,12 +117,12 @@ void StyledButton::setScale( bool on )
scalePixmap();
}
-TQSize StyledButton::tqsizeHint() const
+TQSize StyledButton::sizeHint() const
{
return TQSize( 50, 25 );
}
-TQSize StyledButton::tqminimumSizeHint() const
+TQSize StyledButton::minimumSizeHint() const
{
return TQSize( 50, 25 );
}
@@ -151,14 +151,14 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint )
{
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint);
if (hasFocus())
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
- tqcolorGroup(), TQStyle::Style_Default);
+ colorGroup(), TQStyle::Style_Default);
}
void StyledButton::drawButtonLabel( TQPainter *paint )
@@ -169,7 +169,7 @@ void StyledButton::drawButtonLabel( TQPainter *paint )
paint->setPen( pen );
if(!isEnabled()) {
- paint->setBrush( TQBrush( tqcolorGroup().button() ) );
+ paint->setBrush( TQBrush( colorGroup().button() ) );
}
else if ( edit == PixmapEditor && spix ) {
paint->setBrush( TQBrush( col, *spix ) );
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index f5a193b6..c9c582bd 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -65,8 +65,8 @@ public:
void setScale( bool );
bool scale() const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
void setFormWindow( FormWindow *fw ) { formWindow = fw; }
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index b278019b..deacf5d4 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -314,7 +314,7 @@
<property name="name">
<cstring>buttonDeleteColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -337,7 +337,7 @@
<property name="name">
<cstring>buttonChooseColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -440,7 +440,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -496,7 +496,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -581,7 +581,7 @@
<property name="name">
<cstring>buttonDeleteRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -604,7 +604,7 @@
<property name="name">
<cstring>buttonChooseRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index 4e4fbd83..0e7fe478 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
@@ -214,7 +214,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index e31f5d82..e1f11546 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -296,11 +296,11 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
prev->setAutoRaise( TRUE );
prev->setAutoRepeat( TRUE );
- prev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+ prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" );
next->setAutoRaise( TRUE );
next->setAutoRepeat( TRUE );
- next->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+ next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) );
connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) );
updateButtons();
@@ -498,7 +498,7 @@ TQMap< int, TQStringList > *changedProperties = 0;
void WidgetFactory::saveDefaultProperties( TQObject *w, int id )
{
TQMap< TQString, TQVariant> propMap;
- TQStrList lst = w->tqmetaObject()->propertyNames( TRUE );
+ TQStrList lst = w->metaObject()->propertyNames( TRUE );
for ( uint i = 0; i < lst.count(); ++i ) {
TQVariant var = w->property( lst.at( i ) );
if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 )
@@ -653,7 +653,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
}
}
}
- l->tqsetAlignment( align );
+ l->setAlignment( align );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l;
}
@@ -690,7 +690,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
TQPushButton *b = 0;
if ( init ) {
b = new QDesignerPushButton( parent, name );
- b->setText( TQString::tqfromLatin1( name ) );
+ b->setText( TQString::fromLatin1( name ) );
} else {
b = new QDesignerPushButton( parent, name );
}
@@ -714,24 +714,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
} else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
if ( init ) {
QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
- cb->setText( TQString::tqfromLatin1( name ) );
+ cb->setText( TQString::fromLatin1( name ) );
return cb;
}
return new QDesignerCheckBox( parent, name );
} else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
if ( init ) {
QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
- rb->setText( TQString::tqfromLatin1( name ) );
+ rb->setText( TQString::fromLatin1( name ) );
return rb;
}
return new QDesignerRadioButton( parent, name );
} else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
if ( init )
- return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name );
+ return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
return new TQGroupBox( parent, name );
} else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
if ( init )
- return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name );
+ return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
return new TQButtonGroup( parent, name );
} else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_ICONVIEW)
@@ -789,7 +789,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) {
QDesignerLabel *l = new QDesignerLabel( parent, name );
if ( init ) {
- l->setText( TQString::tqfromLatin1( name ) );
+ l->setText( TQString::fromLatin1( name ) );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE );
}
@@ -1469,7 +1469,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
findProperty( propName, TRUE ), TRUE );
if (!p )
return FALSE;
@@ -1482,7 +1482,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
int v = defaultValue( w, "tqalignment" ).toInt();
return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
- return TQVariant( TQString::tqfromLatin1( "" ) );
+ return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant();
} else if ( propName == "frameworkCode" ) {
@@ -1496,8 +1496,8 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE );
+ const TQMetaProperty *p = w->metaObject()->
+ property( w->metaObject()->findProperty( propName, TRUE ), TRUE );
if ( !p ) {
int v = defaultValue( w, "tqalignment" ).toInt();
if ( propName == "hAlign" ) {
@@ -1536,8 +1536,8 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name,
TQVariant WidgetFactory::property( TQObject *w, const char *name )
{
- int id = w->tqmetaObject()->findProperty( name, TRUE );
- const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE );
+ int id = w->metaObject()->findProperty( name, TRUE );
+ const TQMetaProperty* p = w->metaObject()->property( id, TRUE );
if ( !p || !p->isValid() )
return MetaDataBase::fakeProperty( w, name );
return w->property( name );
@@ -1549,7 +1549,7 @@ void QDesignerLabel::updateBuddy()
if ( myBuddy.isEmpty() )
return;
- TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
+ TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
if ( !l || !l->first() ) {
delete l;
return;
@@ -1607,7 +1607,7 @@ bool TQLayoutWidget::event( TQEvent *e )
void TQLayoutWidget::updateSizePolicy()
{
if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
- sp = TQWidget::tqsizePolicy();
+ sp = TQWidget::sizePolicy();
return;
}
@@ -1652,13 +1652,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( !w->tqsizePolicy().mayGrowHorizontally() )
+ if ( !w->sizePolicy().mayGrowHorizontally() )
ht &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( !w->sizePolicy().mayShrinkHorizontally() )
ht &= ~TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
@@ -1673,13 +1673,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( !w->tqsizePolicy().mayGrowVertically() )
+ if ( !w->sizePolicy().mayGrowVertically() )
vt &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkVertically() )
+ if ( !w->sizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
@@ -1698,24 +1698,24 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
}
#ifdef USE_QT4
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+ if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
#else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
#endif // USE_QT4
ht = TQSizePolicy::Expanding;
#ifdef USE_QT4
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+ if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
#else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
#endif // USE_QT4
@@ -1734,8 +1734,8 @@ void CustomWidget::paintEvent( TQPaintEvent *e )
( (FormWindow*)parentWidget() )->paintGrid( this, e );
} else {
TQPainter p( this );
- p.fillRect( rect(), tqcolorGroup().dark() );
- p.setPen( tqcolorGroup().light() );
+ p.fillRect( rect(), colorGroup().dark() );
+ p.setPen( colorGroup().light() );
p.drawText( 2, 2, width() - 4, height() - 4, TQt::AlignAuto | TQt::AlignTop, cusw->className );
p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
( height() - cusw->pixmap->height() ) / 2,
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index 1bb1f1f3..a2bf5ff1 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -264,16 +264,16 @@ public:
CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
: TQWidget( parent, name ), cusw( cw ) {
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
- tqsetSizePolicy( cw->sizePolicy );
+ setSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
setBackgroundMode( PaletteDark );
}
- TQSize tqsizeHint() const {
- TQSize sh = cusw->tqsizeHint;
+ TQSize sizeHint() const {
+ TQSize sh = cusw->sizeHint;
if ( sh.isValid() )
return sh;
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
TQString realClassName() { return cusw->className; }
diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui
index 028a1341..84302d09 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/kdevdesigner/designer/wizardeditor.ui
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -201,7 +201,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp
index d761a9e7..2e4f9f20 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp
@@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten
TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const
{
TQStrList sigs;
- sigs = obj->tqmetaObject()->signalNames( TRUE );
+ sigs = obj->metaObject()->signalNames( TRUE );
sigs.remove( "destroyed()" );
return sigs;
}
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp
index 1ba246bd..1fb2c5a7 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/kdevdesigner/shared/parser.cpp
@@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func )
}
res += ")";
- return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+ return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
}
diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp
index 443df331..a38f859c 100644
--- a/kdevdesigner/shared/uib.cpp
+++ b/kdevdesigner/shared/uib.cpp
@@ -32,7 +32,7 @@ static const char commonStrings[] =
"TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0"
"TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0"
"default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0"
- "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
+ "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
"toolTip\0unnamed\0whatsThis";
UibStrTable::UibStrTable()
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index c61584a7..2ac6d22e 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
if ( name == "orientation" ) {
vertical = ( value == "Vertical" );
- } else if ( name == "tqsizeHint" ) {
+ } else if ( name == "sizeHint" ) {
w = value.toSize().width();
h = value.toSize().height();
} else if ( name == "sizeType" ) {
@@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
case Object_PaletteProperty:
{
TQPalette palette;
- TQColorGroup tqcolorGroup;
+ TQColorGroup colorGroup;
TQColor color;
int role = -1;
@@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
while ( !in.atEnd() && paletteTag != Palette_End ) {
switch ( paletteTag ) {
case Palette_Active:
- palette.setActive( tqcolorGroup );
+ palette.setActive( colorGroup );
role = -1;
break;
case Palette_Inactive:
- palette.setInactive( tqcolorGroup );
+ palette.setInactive( colorGroup );
role = -1;
break;
case Palette_Disabled:
- palette.setDisabled( tqcolorGroup );
+ palette.setDisabled( colorGroup );
role = -1;
break;
case Palette_Color:
role++;
in >> color;
- tqcolorGroup.setColor( (TQColorGroup::ColorRole) role,
+ colorGroup.setColor( (TQColorGroup::ColorRole) role,
color );
break;
case Palette_Pixmap:
unpackVariant( strings, in, value );
- tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role,
+ colorGroup.setBrush( (TQColorGroup::ColorRole) role,
TQBrush(color, value.asPixmap()) );
break;
default:
@@ -1788,7 +1788,7 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return 0;
}
}
- l->tqsetAlignment( align );
+ l->setAlignment( align );
l->setMargin( margin );
l->setSpacing( spacing );
return l;
@@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co
void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
TQVariant value )
{
- int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE );
+ int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
if ( offset != -1 ) {
if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
@@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
if ( value.type() == TQVariant::String ||
value.type() == TQVariant::CString ) {
const TQMetaProperty *metaProp =
- obj->tqmetaObject()->property( offset, TRUE );
+ obj->metaObject()->property( offset, TRUE );
if ( metaProp != 0 && metaProp->isEnumType() ) {
if ( metaProp->isSetType() ) {
TQStrList flagsCStr;
@@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
orient = Qt::Vertical;
} else if ( prop == "sizeType" ) {
sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
- } else if ( prop == "tqsizeHint" ) {
+ } else if ( prop == "sizeHint" ) {
w = n.firstChild().firstChild().firstChild().toText().data().toInt();
h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
}
@@ -2144,12 +2144,12 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+ TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+ TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
// if this is a connection to a custom slot and we have a connector, try this as receiver
if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) {
- slotList = connector->tqmetaObject()->slotNames( TRUE );
+ slotList = connector->metaObject()->slotNames( TRUE );
receiver = connector;
}
diff --git a/languages/ada/README.dox b/languages/ada/README.dox
index d9cd67bd..d4bd3352 100644
--- a/languages/ada/README.dox
+++ b/languages/ada/README.dox
@@ -24,7 +24,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato
\authors <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a>
\authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\requirement Ada compiler
diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp
index 43b94fa7..d7b8bbf7 100644
--- a/languages/ada/ada_utils.cpp
+++ b/languages/ada/ada_utils.cpp
@@ -16,7 +16,7 @@
TQString qtext (const RefAdaAST& n)
{
- return TQString::tqfromLatin1 (text (n).c_str ());
+ return TQString::fromLatin1 (text (n).c_str ());
}
TQStringList qnamelist (const RefAdaAST& n)
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index 85374ee4..4c035cb2 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -143,7 +143,7 @@ void AdaSupportPart::initialParse ()
TQString fn = project ()->projectDirectory () + "/" + *it;
maybeParse (fn);
- kapp->tqprocessEvents (500);
+ kapp->processEvents (500);
}
emit updatedSourceInfo();
@@ -250,7 +250,7 @@ void AdaSupportPart::parse (const TQString &fileName)
}
} catch (antlr::ANTLRException& ex) {
kdDebug () << "*exception*: " << ex.toString ().c_str () << endl;
- d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage ().c_str() ),
+ d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage ().c_str() ),
fileName,
lexer.getLine (),
lexer.getColumn ());
@@ -285,7 +285,7 @@ void AdaSupportPart::parseContents (const TQString& contents, const TQString& fi
} catch (antlr::ANTLRException& ex) {
kdDebug () << "*exception*: " << ex.toString ().c_str () << endl;
- d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage().c_str() ),
+ d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage().c_str() ),
fileName,
lexer.getLine (),
lexer.getColumn ());
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index f38491b9..2c5633ee 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -64,7 +64,7 @@ void BackgroundParser::run()
} catch( antlr::ANTLRException& ex ){
kdDebug() << "*exception*: " << ex.toString().c_str() << endl;
- m_reporter->reportError( TQString::tqfromLatin1( ex.getMessage().c_str() ),
+ m_reporter->reportError( TQString::fromLatin1( ex.getMessage().c_str() ),
m_fileName,
lexer.getLine(),
lexer.getColumn() );
diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui
index 32ca9e54..f2e03383 100644
--- a/languages/ada/configproblemreporter.ui
+++ b/languages/ada/configproblemreporter.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>101</height>
diff --git a/languages/bash/README.dox b/languages/bash/README.dox
index af38febf..95765f0a 100644
--- a/languages/bash/README.dox
+++ b/languages/bash/README.dox
@@ -10,6 +10,6 @@ Supports bash language
\feature runs bash script in external terminal
\feature syntax highlighting and code folding via katepart
\feature Code completion works for variables
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
*/
diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox
index 04c7fe30..4ac19153 100644
--- a/languages/cpp/README.dox
+++ b/languages/cpp/README.dox
@@ -16,7 +16,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st
\feature can do code completion
\feature has presistent class store
\feature code highlight
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a>
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 69d373fd..f99106b7 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -248,13 +248,13 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const
switch ( var->access() )
{
case CodeModelItem::Public:
- return TQString::tqfromLatin1( "Public" );
+ return TQString::fromLatin1( "Public" );
case CodeModelItem::Protected:
- return TQString::tqfromLatin1( "Protected" );
+ return TQString::fromLatin1( "Protected" );
case CodeModelItem::Private:
- return TQString::tqfromLatin1( "Private" );
+ return TQString::fromLatin1( "Private" );
}
return TQString();
diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index 0ad0f62e..0ca00eb4 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -244,7 +244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 6f13ed91..04e07285 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -119,24 +119,24 @@ void AddMethodDialog::reject()
TQString AddMethodDialog::accessID( FunctionDom fun ) const
{
if ( fun->isSignal() )
- return TQString::tqfromLatin1( "Signals" );
+ return TQString::fromLatin1( "Signals" );
switch ( fun->access() )
{
case CodeModelItem::Public:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "Public Slots" );
- return TQString::tqfromLatin1( "Public" );
+ return TQString::fromLatin1( "Public Slots" );
+ return TQString::fromLatin1( "Public" );
case CodeModelItem::Protected:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "Protected Slots" );
- return TQString::tqfromLatin1( "Protected" );
+ return TQString::fromLatin1( "Protected Slots" );
+ return TQString::fromLatin1( "Protected" );
case CodeModelItem::Private:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "Private Slots" );
- return TQString::tqfromLatin1( "Private" );
+ return TQString::fromLatin1( "Private Slots" );
+ return TQString::fromLatin1( "Private" );
}
return TQString();
@@ -248,7 +248,7 @@ void AddMethodDialog::accept()
bool isInline = currentItem->text( 0 ) == "True";
if ( !isInline )
{
- editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
+ editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
editIface->insertText( editIface->numLines() - 1, 0, str );
m_cppSupport->backgroundParser() ->addFile( implementationFile );
}
@@ -387,7 +387,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const
<< ind << " */\n";
stream
- << ind << item->text( 3 ) << " " << ( isInline ? TQString::tqfromLatin1( "" ) : fullName + "::" )
+ << ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" )
<< item->text( 4 ) << "\n"
<< ind << "{\n"
<< ind << " /// @todo implement me\n"
diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index a3887be6..40a59154 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui
index 46a35473..03af967a 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index f1e5fdfb..3a78c979 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>41</width>
<height>20</height>
@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>41</width>
<height>20</height>
@@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>41</width>
<height>20</height>
diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
index a343c6cf..b1115e6f 100644
--- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 46a35473..03af967a 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 508f7cc9..b859d95f 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -132,7 +132,7 @@
show();
// What it is now, stay.
- setFixedSize(tqminimumSize());
+ setFixedSize(minimumSize());
}
%{APPNAME}UI::~%{APPNAME}UI()
diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h
index 7da09f5a..92a4019f 100644
--- a/languages/cpp/app_templates/opieapp/example.h
+++ b/languages/cpp/app_templates/opieapp/example.h
@@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base
public:
static TQString appName() {
- return TQString::tqfromLatin1("%{APPNAMELC}" );
+ return TQString::fromLatin1("%{APPNAMELC}" );
}
%{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~%{APPNAME}();
diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h
index 5c928ec9..b19152b6 100644
--- a/languages/cpp/app_templates/opienet/simmplemodule.h
+++ b/languages/cpp/app_templates/opienet/simmplemodule.h
@@ -12,7 +12,7 @@ public:
VirtualModule();
~VirtualModule();
- const TQString type() {return TQString::tqfromLatin1("vpn" );}
+ const TQString type() {return TQString::fromLatin1("vpn" );}
void setProfile( const TQString& ) {}
bool isOwner( Interface* );
TQWidget *configure( Interface* );
@@ -21,7 +21,7 @@ public:
void possibleNewInterfaces( TQMap<TQString, TQString>& );
Interface *addNewInterface( const TQString& );
bool remove( Interface* iface );
- TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); }
+ TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); }
void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
private:
TQList<Interface> m_interfaces;
diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp
index e98148d2..bbabcbda 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.cpp
+++ b/languages/cpp/app_templates/opienet/simpleiface.cpp
@@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() {
void %{APPNAME}Interface::start() {
// call pptp
- settqStatus(true);
+ setStatus(true);
refresh();
emit updateMessage("VPN started");
}
void %{APPNAME}Interface::stop() {
- settqStatus(false );
+ setStatus(false );
refresh();
emit updateMessage("VPN halted");
}
diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h
index 327c1d43..6fce8b10 100644
--- a/languages/cpp/app_templates/opienet/simplemodule.h
+++ b/languages/cpp/app_templates/opienet/simplemodule.h
@@ -12,7 +12,7 @@ public:
%{APPNAME}Module();
~%{APPNAME}Module();
- const TQString type() {return TQString::tqfromLatin1("vpn" );}
+ const TQString type() {return TQString::fromLatin1("vpn" );}
void setProfile( const TQString& ) {}
bool isOwner( Interface* );
TQWidget *configure( Interface* );
@@ -21,7 +21,7 @@ public:
void possibleNewInterfaces( TQMap<TQString, TQString>& );
Interface *addNewInterface( const TQString& );
bool remove( Interface* iface );
- TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); }
+ TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); }
void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
private:
TQList<Interface> m_interfaces;
diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
index 12d702b6..3606927f 100644
--- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp
+++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
@@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const {
// this sets the image that will be shown on the left side of the plugin
TQString %{APPNAME}::pixmapNameWidget() const {
- return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}");
+ return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}");
}
TQWidget* %{APPNAME}::widget( TQWidget * wid ) {
diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c
index e0317932..0a34b6c4 100644
--- a/languages/cpp/app_templates/prc-tool/palmhello.c
+++ b/languages/cpp/app_templates/prc-tool/palmhello.c
@@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e)
break;
case menuEvent:
- MenuErasetqStatus(NULL);
+ MenuEraseStatus(NULL);
switch(e->data.menu.itemID) {
}
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 9fded09c..d3dbba32 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -73,7 +73,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
if ( ( ( ClassSpecifierAST* ) ast ) ->name() )
{
s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text();
- s = s.isEmpty() ? TQString::tqfromLatin1( "<unnamed>" ) : s;
+ s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s;
scope.push_back( s );
}
break;
@@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
case NodeType_Namespace:
{
AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName();
- s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1( "<unnamed>" );
+ s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" );
scope.push_back( s );
}
break;
@@ -141,7 +141,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
text += scope;
if ( declarator->subDeclarator() )
- text += TQString::tqfromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::tqfromLatin1( ")" );
+ text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" );
if ( declarator->declaratorId() )
text += declarator->declaratorId() ->text();
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 441d1bb1..857c61d3 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -243,7 +243,7 @@ completion-box.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -413,7 +413,7 @@ Note: Parsing may become very slow when this is enabled
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -449,7 +449,7 @@ Note: Parsing may become very slow when this is enabled
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -558,7 +558,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -691,7 +691,7 @@ navigate the header and vice versa</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>400</height>
@@ -853,7 +853,7 @@ plugin enabled to have use all options.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>337</height>
@@ -963,7 +963,7 @@ This option only applies to QMake projects.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>470</width>
<height>20</height>
@@ -1217,7 +1217,7 @@ This option only applies to QMake projects.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -1282,7 +1282,7 @@ This option only applies to QMake projects.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -1435,7 +1435,7 @@ you right click on a variable in a header file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1460,7 +1460,7 @@ you right click on a variable in a header file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>87</width>
<height>20</height>
@@ -1477,7 +1477,7 @@ you right click on a variable in a header file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>92</width>
<height>20</height>
@@ -1494,7 +1494,7 @@ you right click on a variable in a header file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>92</width>
<height>20</height>
@@ -1513,7 +1513,7 @@ you right click on a variable in a header file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>91</height>
diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp
index 7498ad23..cf255601 100644
--- a/languages/cpp/codeinformationrepository.cpp
+++ b/languages/cpp/codeinformationrepository.cpp
@@ -265,7 +265,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC
{
TQString argName = argumentNames[ i ];
if ( !argName.isEmpty() )
- signature += TQString::tqfromLatin1( " " ) + argName;
+ signature += TQString::fromLatin1( " " ) + argName;
}
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 9796bd17..b4978a2d 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -1613,7 +1613,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
else
gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
- popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
+ popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
/*if( type.sourceVariable && type.sourceVariable.name != "this" ) {
int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
@@ -1633,7 +1633,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
else
gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
- popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
+ popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
PopupClassViewFillerHelpStruct h( this );
PopupFiller<PopupClassViewFillerHelpStruct> filler( h, "" );
@@ -4467,7 +4467,7 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS
//It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>').
isIncludeDirective = true;
usedProjectFiles = false;
- TQStringList captured = includeRx.tqcapturedTexts();
+ TQStringList captured = includeRx.capturedTexts();
if( captured.size() == 3 ) {
Dependence d;
d.first = captured[1];
diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp
index 1bcc6ace..8372efeb 100644
--- a/languages/cpp/cppcodecompletionconfig.cpp
+++ b/languages/cpp/cppcodecompletionconfig.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
#include <tqdom.h>
-TQString CppCodeCompletionConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/codecompletion" );
+TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" );
CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom )
: TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index dd4d278b..243c643f 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -1896,11 +1896,11 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
+ ( advConstructorsHeader.isEmpty() ? TQString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader )
+ TQString("\n ~$CLASSNAME$();\n")
+ advH_public
- + (advH_public_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
- + (advH_protected.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected:" + advH_protected))
- + (advH_protected_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
- + (advH_private.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate:" + advH_private))
- + (advH_private_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
+ + (advH_public_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
+ + (advH_protected.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected:" + advH_protected))
+ + (advH_protected_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
+ + (advH_private.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate:" + advH_private))
+ + (advH_private_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
+ TQString("};\n"
"\n")
+ namespaceEnd
@@ -1963,7 +1963,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
if ( !it.current() ->text( 0 ).isEmpty() )
if ( !it.current() ->text( 3 ).isEmpty() )
// if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING))
- includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#include " ) +
+ includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) +
( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) )
+ it.current() ->text( 3 )
+ ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) );
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index a5405690..f4d3a399 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -270,7 +270,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -320,7 +320,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -403,7 +403,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -431,7 +431,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -658,7 +658,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
@@ -680,7 +680,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
@@ -700,7 +700,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -958,7 +958,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp
index a9edc315..7298354b 100644
--- a/languages/cpp/cppsplitheadersourceconfig.cpp
+++ b/languages/cpp/cppsplitheadersourceconfig.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tqdom.h>
-TQString CppSplitHeaderSourceConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/splitheadersource" );
+TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" );
CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom )
: TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index ac9d52ba..22d22fd8 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
if ( !text.isEmpty() )
{
id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
+ popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
"based on the member declaration at the current line." ) );
}
@@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
{
TQPopupMenu * m2 = new TQPopupMenu( popup );
id = popup->insertItem( i18n( "Go to Declaration" ), m2 );
- popup->tqsetWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
+ popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
"in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
FileDom file2 = codeModel() ->fileByName( candidate );
@@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
text += "::";
}
text += formatModelItem( *it, true );
- text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
+ text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) );
int line, column;
( *it ) ->getStartPosition( &line, &column );
@@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
{
TQPopupMenu * m = new TQPopupMenu( popup );
id = popup->insertItem( i18n( "Go to Definition" ), m );
- popup->tqsetWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
+ popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
"in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
const FileDom file = codeModel() ->fileByName( candidate1 );
@@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
text += "::";
}
text += formatModelItem( *it, true );
- text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
+ text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) );
int line, column;
( *it ) ->getStartPosition( &line, &column );
@@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
{
m_activeClass = ( ClassModel* ) mcontext->item();
int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
+ popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
"No implementation code is extracted and no implementation code is created." ) );
}
else if ( mcontext->item() ->isFunction() )
@@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
{
m_contextFileName = url.path();
int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
- popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
+ popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
}
}
}
@@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace();
if ( declarator->exceptionSpecification() )
{
- declStr += TQString::tqfromLatin1( " throw( " );
+ declStr += TQString::fromLatin1( " throw( " );
TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList();
TQPtrListIterator<AST> type_it( l );
while ( type_it.current() )
@@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
++type_it;
if ( type_it.current() )
- declStr += TQString::tqfromLatin1( ", " );
+ declStr += TQString::fromLatin1( ", " );
}
- declStr += TQString::tqfromLatin1( " )" );
+ declStr += TQString::fromLatin1( " )" );
}
text += "\n\n";
@@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag )
switch ( tag.kind() )
{
case Tag::Kind_Namespace:
- return TQString::tqfromLatin1( "namespace " ) + tag.name();
+ return TQString::fromLatin1( "namespace " ) + tag.name();
case Tag::Kind_Class:
- return TQString::tqfromLatin1( "class " ) + tag.name();
+ return TQString::fromLatin1( "class " ) + tag.name();
case Tag::Kind_Function:
case Tag::Kind_FunctionDeclaration:
@@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
if ( !editIface )
return ; //@fixme errorverdoedelung
- editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
+ editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
editIface->insertText( editIface->numLines() - 1, 0, definitionString );
backgroundParser() ->addFile( implementationFile );
}
@@ -3143,7 +3143,7 @@ void UIBlockTester::UIBlockTesterThread::run() {
while(!m_stop) {
msleep( m_parent.m_msecs / 10 );
m_parent.m_timeMutex.lock();
- TQDateTime t = TQDateTime::tqcurrentDateTime();
+ TQDateTime t = TQDateTime::currentDateTime();
uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() );
if( msecs > m_parent.m_msecs ) {
m_parent.lockup();
@@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() {
void UIBlockTester::timer() {
m_timeMutex.lock();
- m_lastTime = TQDateTime::tqcurrentDateTime();
+ m_lastTime = TQDateTime::currentDateTime();
m_timeMutex.unlock();
}
diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui
index fd4feaf6..81edebf0 100644
--- a/languages/cpp/creategettersetter.ui
+++ b/languages/cpp/creategettersetter.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp
index 3bee7f16..7190e796 100644
--- a/languages/cpp/creategettersetterconfiguration.cpp
+++ b/languages/cpp/creategettersetterconfiguration.cpp
@@ -17,7 +17,7 @@
#include <tqdom.h>
#include <kmessagebox.h>
-TQString CreateGetterSetterConfiguration::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/creategettersetter" );
+TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part )
: TQObject(part), m_part(part), m_settings(0)
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index f40f7c94..eafbc184 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>111</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>81</height>
diff --git a/languages/cpp/debugger/TODO.txt b/languages/cpp/debugger/TODO.txt
index 563cf85c..38aca109 100644
--- a/languages/cpp/debugger/TODO.txt
+++ b/languages/cpp/debugger/TODO.txt
@@ -69,7 +69,7 @@ TODO:
- Add icons
- - tqStatus display column is just ugly
+ - Status display column is just ugly
- Handle "out of breakpoints" message.
diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h
index c87a333f..f8103ab2 100644
--- a/languages/cpp/debugger/dbgcontroller.h
+++ b/languages/cpp/debugger/dbgcontroller.h
@@ -118,7 +118,7 @@ signals:
void gdbUserCommandStdout (const char *output);
void gdbStderr (const char *output);
void showStepInSource (const TQString &fileName, int lineNum, const TQString &address);
- void dbgtqStatus (const TQString &status, int statusFlag);
+ void dbgStatus (const TQString &status, int statusFlag);
protected:
KProcess *dbgProcess_;
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index e8bb0c90..27b79783 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -120,7 +120,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
offset_ = parentWidget()->pos() - e->globalPos();
setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
- setPalette(TQPalette(tqcolorGroup().background()));
+ setPalette(TQPalette(colorGroup().background()));
tqrepaint();
}
}
@@ -134,7 +134,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
offset_ = TQPoint(0,0);
setFrameStyle(TQFrame::Panel|TQFrame::Raised);
TQApplication::restoreOverrideCursor();
- setPalette(TQPalette(tqcolorGroup().background()));
+ setPalette(TQPalette(colorGroup().background()));
tqrepaint();
}
@@ -162,7 +162,7 @@ public:
DbgToolBar *parent, const char *name=0);
virtual ~DbgButton() {};
void drawButtonLabel(TQPainter *painter);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
private:
TQPixmap pixmap_;
@@ -191,21 +191,21 @@ void DbgButton::drawButtonLabel(TQPainter *painter)
painter->drawPixmap(x, y, pixmap_);
if (hasText) {
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text());
}
}
// **************************************************************************
-TQSize DbgButton::tqsizeHint() const
+TQSize DbgButton::sizeHint() const
{
if (text().isEmpty())
return pixmap_.size();
else
{
TQSize ps = pixmap_.size();
- TQSize bs = TQPushButton::tqsizeHint();
+ TQSize bs = TQPushButton::sizeHint();
TQSize result;
result.setWidth( ps.width() + bs.width()+10 );
result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() );
@@ -365,12 +365,12 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
nextLayout->addWidget(bNext);
nextLayout->addWidget(bNexti);
-// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width());
-// w = TQMAX(w, bInterrupt->tqsizeHint().width());
-// w = TQMAX(w, bView->tqsizeHint().width());
+// int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width());
+// w = TQMAX(w, bInterrupt->sizeHint().width());
+// w = TQMAX(w, bView->sizeHint().width());
// they should have the same height, so don't be too fussy
-// int h = bFinish->tqsizeHint().height();
+// int h = bFinish->sizeHint().height();
//
// bNext->setMinimumHeight(h);
// bNexti->setMinimumHeight(h);
@@ -404,10 +404,10 @@ void DbgToolBar::slotKdevFocus()
// If anyone has a way of determining what window the app is _actually_ running on
// then please fix and send a patch.
- if (winModule_->activeWindow() != tqtopLevelWidget()->winId())
+ if (winModule_->activeWindow() != topLevelWidget()->winId())
activeWindow_ = winModule_->activeWindow();
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
}
// **************************************************************************
@@ -421,7 +421,7 @@ void DbgToolBar::slotPrevFocus()
// If the app is active then the app button is highlighted, otherwise
// kdev button is highlighted.
-void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
+void DbgToolBar::slotDbgStatus(const TQString&, int state)
{
bool appIndicator = state & s_dbgBusy;
if (appIndicator != appIsActive_) {
@@ -435,11 +435,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
void DbgToolBar::setAppIndicator(bool appIndicator)
{
if (appIndicator) {
- bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
- bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
+ bPrevFocus_->setPalette(TQPalette(colorGroup().mid()));
+ bKDevFocus_->setPalette(TQPalette(colorGroup().background()));
} else {
- bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
- bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
+ bPrevFocus_->setPalette(TQPalette(colorGroup().background()));
+ bKDevFocus_->setPalette(TQPalette(colorGroup().mid()));
}
}
@@ -487,7 +487,7 @@ void DbgToolBar::slotActivateAndUndock()
if (!docked_)
return;
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
slotUndock();
}
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index 5e1424d7..7f124c6c 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -58,7 +58,7 @@ public:
virtual ~DbgToolBar();
private slots:
- void slotDbgtqStatus(const TQString&, int);
+ void slotDbgStatus(const TQString&, int);
void slotDock();
void slotUndock();
void slotIconifyAndDock();
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index d4c97957..05a8cf78 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -78,7 +78,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent,
// ??? DomUtil::readEntry(dom, "/kdevdebugger/general/allowforcedbpset");
- resize(tqsizeHint());
+ resize(sizeHint());
}
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index a3a1e321..eee96cb9 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -404,7 +404,7 @@ or if your executable contains the gdb stub
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 59294487..8fff0206 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -92,7 +92,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
statusBarIndicator = new LabelWithDoubleClick(
" ", mainWindow()->statusBar());
statusBarIndicator->setFixedWidth(15);
- statusBarIndicator->tqsetAlignment(TQt::AlignCenter);
+ statusBarIndicator->setAlignment(TQt::AlignCenter);
mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true);
statusBarIndicator->show();
@@ -500,7 +500,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
this, TQT_SLOT(slotRunToCursor()),
0, -1, index);
- popup->tqsetWhatsThis(id, act->whatsThis());
+ popup->setWhatsThis(id, act->whatsThis());
index += running;
}
}
@@ -510,7 +510,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
this, TQT_SLOT(toggleBreakpoint()),
0, -1, index);
index += running;
- popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
+ popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
}
if (!m_contextIdent.isEmpty())
{
@@ -519,12 +519,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
this, TQT_SLOT(contextEvaluate()),
0, -1, index);
index += running;
- popup->tqsetWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
+ popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed),
this, TQT_SLOT(contextWatch()),
0, -1, index);
index += running;
- popup->tqsetWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
+ popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
}
if (running)
popup->insertSeparator(index);
@@ -589,8 +589,8 @@ void DebuggerPart::setupController()
disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&)));
// controller -> this
- connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
- this, TQT_SLOT(slottqStatus(const TQString&, int)));
+ connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
+ this, TQT_SLOT(slotStatus(const TQString&, int)));
connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
this, TQT_SLOT(slotShowStep(const TQString&, int)));
connect( controller, TQT_SIGNAL(debuggerAbnormalExit()),
@@ -613,16 +613,16 @@ void DebuggerPart::setupController()
connect( controller, TQT_SIGNAL(gdbStderr(const char*)),
gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) );
- connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
- gdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int)));
+ connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
+ gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int)));
// controller -> viewerWidget
- connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+ connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int)));
connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()),
- controller, TQT_SLOT(explainDebuggertqStatus()));
+ controller, TQT_SLOT(explainDebuggerStatus()));
}
@@ -1092,7 +1092,7 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP)
}
}
-void DebuggerPart::slottqStatus(const TQString &msg, int state)
+void DebuggerPart::slotStatus(const TQString &msg, int state)
{
TQString stateIndicator, stateIndicatorFull;
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index b201b15a..40877e29 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -95,7 +95,7 @@ private slots:
void slotRefreshBPState(const Breakpoint&);
- void slottqStatus(const TQString &msg, int state);
+ void slotStatus(const TQString &msg, int state);
void slotShowStep(const TQString &fileName, int lineNum);
void slotGotoSource(const TQString &fileName, int lineNum);
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index 51cfe410..faa68cd7 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 8626a3e1..18851c58 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -56,7 +56,7 @@ enum Column {
Control = 0,
Enable = 1,
Type = 2,
- tqStatus = 3,
+ Status = 3,
Location = 4,
Condition = 5,
IgnoreCount = 6,
@@ -161,7 +161,7 @@ void BreakpointTableRow::setRow()
TQString status=m_breakpoint->statusDisplay(m_activeFlag);
- table()->setText(row(), tqStatus, status);
+ table()->setText(row(), Status, status);
table()->setText(row(), Condition, m_breakpoint->conditional());
table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() ));
table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() ));
@@ -183,7 +183,7 @@ void BreakpointTableRow::setRow()
table()->setText(row(), Type, displayType);
table()->adjustColumn(Type);
- table()->adjustColumn(tqStatus);
+ table()->adjustColumn(Status);
table()->adjustColumn(Location);
table()->adjustColumn(Hits);
table()->adjustColumn(IgnoreCount);
@@ -208,7 +208,7 @@ controller_(controller)
m_table->hideColumn(Control);
m_table->setColumnReadOnly(Type, true);
- m_table->setColumnReadOnly(tqStatus, true);
+ m_table->setColumnReadOnly(Status, true);
m_table->setColumnReadOnly(Hits, true);
m_table->setColumnWidth( Enable, 20);
@@ -216,7 +216,7 @@ controller_(controller)
header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") );
- header->setLabel( tqStatus, i18n("Status") );
+ header->setLabel( Status, i18n("Status") );
header->setLabel( Location, i18n("Location") );
header->setLabel( Condition, i18n("Condition") );
header->setLabel( IgnoreCount, i18n("Ignore Count") );
@@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const
TQPushButton* b = new TQPushButton("...", box);
// This is exactly what is done in TQDesigner source in the
// similar context. Haven't had any success making the good look
- // with tqlayout, I suppose that tqsizeHint for button is always larger
+ // with tqlayout, I suppose that sizeHint for button is always larger
// than 20.
b->setFixedWidth( 20 );
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index ab7ffe69..7808fccc 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -320,7 +320,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
<< (stateReloadInProgress_ ? " (state reloading)\n" : "\n");
setStateOn(s_dbgBusy);
- emit dbgtqStatus("", state_);
+ emit dbgStatus("", state_);
raiseEvent(debugger_busy);
executeCmd();
@@ -409,7 +409,7 @@ void GDBController::executeCmd()
else
emit gdbInternalCommandStdout( prettyCmd.latin1() );
- emit dbgtqStatus ("", state_);
+ emit dbgStatus ("", state_);
}
// **************************************************************************
@@ -540,7 +540,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
// or whatever).
setStateOff(s_explicitBreakInto);
- emit dbgtqStatus("Application interrupted", state_);
+ emit dbgStatus("Application interrupted", state_);
// Will show the source line in the code
// handling non-special stop kinds, below.
}
@@ -592,7 +592,7 @@ void GDBController::reloadProgramState()
maybeAnnounceWatchpointHit();
}
- emit dbgtqStatus ("", state_);
+ emit dbgStatus ("", state_);
// We're always at frame zero when the program stops
// and we must reset the active flag
@@ -648,7 +648,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox)
if (msgBox)
KMessageBox::information(0, i18n("gdb message:\n")+msg,"Warning", "gdb_error");
- emit dbgtqStatus (msg, state_);
+ emit dbgStatus (msg, state_);
/* Also show message in gdb window, so that users who
prefer to look at gdb window know what's up. */
emit gdbUserCommandStdout(msg.ascii());
@@ -755,7 +755,7 @@ void GDBController::maybeAnnounceWatchpointHit()
}
else if (last_stop_reason == "read-watchpoint-trigger")
{
- emit dbgtqStatus ("Read watchpoint triggered", state_);
+ emit dbgStatus ("Read watchpoint triggered", state_);
}
}
}
@@ -853,7 +853,7 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
}
setStateOff(s_dbgNotStarted);
- emit dbgtqStatus ("", state_);
+ emit dbgStatus ("", state_);
saw_gdb_prompt_ = false;
@@ -1043,7 +1043,7 @@ void GDBController::slotStopDebugger()
gdbOutput_ = "";
setState(s_dbgNotStarted | s_appNotStarted);
- emit dbgtqStatus (i18n("Debugger stopped"), state_);
+ emit dbgStatus (i18n("Debugger stopped"), state_);
raiseEvent(debugger_exited);
}
@@ -1352,7 +1352,7 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result)
if (msg.contains("No such process"))
{
setState(s_appNotStarted|s_programExited);
- emit dbgtqStatus (i18n("Process exited"), state_);
+ emit dbgStatus (i18n("Process exited"), state_);
raiseEvent(program_exited);
return;
}
@@ -1629,7 +1629,7 @@ void GDBController::commandDone()
{
kdDebug(9012) << "No more commands\n";
setStateOff(s_dbgBusy);
- emit dbgtqStatus("", state_);
+ emit dbgStatus("", state_);
raiseEvent(debugger_ready);
}
}
@@ -1688,7 +1688,7 @@ void GDBController::raiseEvent(event_t e)
void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen)
{
// At the moment, just drop a message out and redirect
- kdDebug(9012) << "STDERR: " << TQString::tqfromLatin1(buf, buflen+1) << endl;
+ kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl;
slotDbgStdout(proc, buf, buflen);
}
@@ -1722,7 +1722,7 @@ void GDBController::slotDbgProcessExited(KProcess* process)
destroyCmds();
setState(s_dbgNotStarted|s_appNotStarted|s_programExited);
- emit dbgtqStatus (i18n("Process exited"), state_);
+ emit dbgStatus (i18n("Process exited"), state_);
emit gdbUserCommandStdout("(gdb) Process exited\n");
}
@@ -1743,7 +1743,7 @@ void GDBController::slotUserGDBCmd(const TQString& cmd)
// raiseEvent(program_state_changed);
}
-void GDBController::explainDebuggertqStatus()
+void GDBController::explainDebuggerStatus()
{
TQString information("%1 commands in queue\n"
"%2 commands being processed by gdb\n"
diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h
index 6ea27f41..3bc0020d 100644
--- a/languages/cpp/debugger/gdbcontroller.h
+++ b/languages/cpp/debugger/gdbcontroller.h
@@ -250,7 +250,7 @@ public slots:
// Pops up a dialog box with some hopefully
// detailed information about which state debugger
// is in, which commands were sent and so on.
- void explainDebuggertqStatus();
+ void explainDebuggerStatus();
protected slots:
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index c0157463..e6f80530 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -62,7 +62,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1);
m_Interrupt = new TQToolButton( this, "add breakpoint" );
- m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
+ m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
( TQSizePolicy::SizeType)0,
0,
0,
@@ -76,7 +76,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
topLayout->addWidget(m_gdbView, 10);
topLayout->addLayout(userGDBCmdEntry);
- slotDbgtqStatus( "", s_dbgNotStarted);
+ slotDbgStatus( "", s_dbgNotStarted);
connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) );
connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto()));
@@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending()
/***************************************************************************/
-void GDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag)
+void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag)
{
if (statusFlag & s_dbgNotStarted)
{
@@ -328,7 +328,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
TQT_SLOT(toggleShowInternalCommands()));
popup->setItemChecked(id, parent_->showInternalCommands_);
- popup->tqsetWhatsThis(
+ popup->setWhatsThis(
id,
i18n(
"Controls if commands issued internally by KDevelop "
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index 28ffb8bc..36db2cfb 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -50,7 +50,7 @@ public slots:
void slotInternalCommandStdout(const char* line);
void slotUserCommandStdout(const char* line);
void slotReceivedStderr(const char* line);
- void slotDbgtqStatus (const TQString &status, int statusFlag);
+ void slotDbgStatus (const TQString &status, int statusFlag);
void slotGDBCmd();
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index a8c9f594..653a4b33 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -47,7 +47,7 @@
/** The variables widget is passive, and is invoked by the rest of the
code via two main slots:
- - slotDbgtqStatus
+ - slotDbgStatus
- slotCurrentFrame
The first is received the program status changes and the second is
@@ -607,7 +607,7 @@ void VariableTree::maybeTip(const TQPoint &p)
VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) );
if ( item )
{
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( r.isValid() )
tip( r, item->tipText() );
}
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index d6b6dd02..b9f1c0a9 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
return ret;
} else {
//We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet
- if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
+ if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
PathResolutionResult ret(false); //Fake that the result is ok
ret.errorMessage = i18n("Cached: ") + (*it).errorMessage;
ret.longErrorMessage = (*it).longErrorMessage;
@@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
ce.failed = true;
ce.errorMessage = res.errorMessage;
ce.longErrorMessage = res.longErrorMessage;
- ce.failTime = TQDateTime::tqcurrentDateTime();
+ ce.failTime = TQDateTime::currentDateTime();
ce.failedFiles[file] = true;
} else {
ce.failed = false;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 77546f8d..b95c825b 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -26,7 +26,7 @@ public:
KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
virtual ~KDevQt4Importer();
- virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
+ virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); }
virtual TQStringList fileList();
virtual TQStringList includePaths();
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index d69e5b0b..6d1c85b6 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -25,7 +25,7 @@ public:
KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
virtual ~KDevQtImporter();
- virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
+ virtual TQString dbName() const { return TQString::fromLatin1("TQt"); }
virtual TQStringList fileList();
virtual TQStringList includePaths();
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index 3e085845..6f0ac590 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>21</height>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
index 06782a37..ccace71a 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
@@ -25,7 +25,7 @@ public:
KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
virtual ~KDevKDELibsImporter();
- virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); }
+ virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
virtual TQStringList fileList();
virtual TQStringList includePaths();
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
index 1f967edc..5e2604d3 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
@@ -96,7 +96,7 @@ Only the selected entry will be used</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 3742c0f6..0705f03c 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
atColumn = 0;
}
- // editIface->insertLine( atLine + 1, TQString::tqfromLatin1("") );
+ // editIface->insertLine( atLine + 1, TQString::fromLatin1("") );
kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl;
kdDebug() << "text: " << stri << endl;
editIface->insertText( atLine, atColumn, stri );
@@ -185,24 +185,24 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const
{
if ( fun->isSignal() )
- return TQString::tqfromLatin1( "signals" );
+ return TQString::fromLatin1( "signals" );
switch ( fun->access() )
{
case CodeModelItem::Public:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "public slots" );
- return TQString::tqfromLatin1( "public" );
+ return TQString::fromLatin1( "public slots" );
+ return TQString::fromLatin1( "public" );
case CodeModelItem::Protected:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "protected slots" );
- return TQString::tqfromLatin1( "protected" );
+ return TQString::fromLatin1( "protected slots" );
+ return TQString::fromLatin1( "protected" );
case CodeModelItem::Private:
if ( fun->isSlot() )
- return TQString::tqfromLatin1( "private slots" );
- return TQString::tqfromLatin1( "private" );
+ return TQString::fromLatin1( "private slots" );
+ return TQString::fromLatin1( "private" );
}
return TQString();
diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui
index 6984dcf6..f6170896 100644
--- a/languages/cpp/subclassingdlgbase.ui
+++ b/languages/cpp/subclassingdlgbase.ui
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
diff --git a/languages/csharp/README.dox b/languages/csharp/README.dox
index e3a47947..130d7104 100644
--- a/languages/csharp/README.dox
+++ b/languages/csharp/README.dox
@@ -12,7 +12,7 @@ and images.
\maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
\feature csharp programming language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/fortran/README.dox b/languages/fortran/README.dox
index 5eeb52a4..0566587c 100644
--- a/languages/fortran/README.dox
+++ b/languages/fortran/README.dox
@@ -14,7 +14,7 @@ and images.
\maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a>
\feature Fortran language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp
index c7b9ccb4..e6b82386 100644
--- a/languages/fortran/ftnchekconfigwidget.cpp
+++ b/languages/fortran/ftnchekconfigwidget.cpp
@@ -84,7 +84,7 @@ protected:
FtnchekItem *flitem = static_cast<FtnchekItem*>(item);
if (item)
- tip(listview->tqitemRect(item), flitem->desc);
+ tip(listview->itemRect(item), flitem->desc);
}
};
diff --git a/languages/fortran/ftnchekconfigwidgetbase.ui b/languages/fortran/ftnchekconfigwidgetbase.ui
index ca20da82..f01271af 100644
--- a/languages/fortran/ftnchekconfigwidgetbase.ui
+++ b/languages/fortran/ftnchekconfigwidgetbase.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -498,7 +498,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/java/README.dox b/languages/java/README.dox
index 0cb5898b..7050482e 100644
--- a/languages/java/README.dox
+++ b/languages/java/README.dox
@@ -13,7 +13,7 @@ and images.
\maintainer <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
\feature Java language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a>
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index bf0333ef..b17a196c 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 53517ced..a3206595 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -267,13 +267,13 @@ TQString ProblemReporter::levelToString( int level ) const
switch( level )
{
case Problem::Level_Error:
- return TQString::tqfromLatin1( "Error" );
+ return TQString::fromLatin1( "Error" );
case Problem::Level_Warning:
- return TQString::tqfromLatin1( "Warning" );
+ return TQString::fromLatin1( "Warning" );
case Problem::Level_Todo:
- return TQString::tqfromLatin1( "Todo" );
+ return TQString::fromLatin1( "Todo" );
case Problem::Level_Fixme:
- return TQString::tqfromLatin1( "Fixme" );
+ return TQString::fromLatin1( "Fixme" );
default:
return TQString();
}
diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui
index 4ac1d94b..de17ef5b 100644
--- a/languages/kjssupport/subclassingdlgbase.ui
+++ b/languages/kjssupport/subclassingdlgbase.ui
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index 7f4148a9..03a16d7e 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/languages/pascal/README.dox b/languages/pascal/README.dox
index 8360d27c..52ef50b1 100644
--- a/languages/pascal/README.dox
+++ b/languages/pascal/README.dox
@@ -15,7 +15,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato
\maintainer <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
\feature Pascal language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Language parser can sometimes treat correct lines as errors. Please send sample code to maintainer if you have this problem.
diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui
index b7c62665..020557a1 100644
--- a/languages/pascal/configproblemreporter.ui
+++ b/languages/pascal/configproblemreporter.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>101</height>
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 2b1edd31..abd1dec1 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList)
{
TQString fn = project()->projectDirectory() + "/" + *it;
maybeParse( fn );
- kapp->tqprocessEvents( 500 );
+ kapp->processEvents( 500 );
emit addedSourceInfo(fn);
}
}
@@ -173,7 +173,7 @@ void PascalSupportPart::initialParse( )
for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){
TQString fn = project()->projectDirectory() + "/" + *it;
maybeParse( fn );
- kapp->tqprocessEvents( 500 );
+ kapp->processEvents( 500 );
}
emit updatedSourceInfo();
@@ -256,10 +256,10 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag )
switch( tag.kind() )
{
case Tag::Kind_Namespace:
- return TQString::tqfromLatin1("unit ") + tag.name();
+ return TQString::fromLatin1("unit ") + tag.name();
case Tag::Kind_Class:
- return TQString::tqfromLatin1("class ") + tag.name();
+ return TQString::fromLatin1("class ") + tag.name();
case Tag::Kind_Function:
case Tag::Kind_FunctionDeclaration:
@@ -271,7 +271,7 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag )
case Tag::Kind_Variable:
case Tag::Kind_VariableDeclaration:
{
- return TQString::tqfromLatin1("var ") + tag.name();
+ return TQString::fromLatin1("var ") + tag.name();
}
break;
}
diff --git a/languages/perl/README.dox b/languages/perl/README.dox
index fc637af6..33020853 100644
--- a/languages/perl/README.dox
+++ b/languages/perl/README.dox
@@ -12,7 +12,7 @@ and images.
\maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
\feature perl programming language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/php/README.dox b/languages/php/README.dox
index 4db52ea9..f388a3c6 100644
--- a/languages/php/README.dox
+++ b/languages/php/README.dox
@@ -14,7 +14,7 @@ all include files from your script.
\maintainer <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a>
\feature PHP language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a>
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index 60c9877b..b17a6580 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) {
FunctionDom nFunc = *funcIt;
- if ((function.isEmpty() || nFunc->name().tqstartsWith(function, FALSE)) && nFunc->isStatic()) {
+ if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) {
KTextEditor::CompletionEntry e;
e.prefix = nClass->name() + " ::";
e.text = nFunc->name();
@@ -362,7 +362,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString
ClassList::Iterator classIt;
for (classIt = classList.begin(); classIt != classList.end(); ++classIt) {
ClassDom nClass = *classIt;
- if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) {
+ if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) {
KTextEditor::CompletionEntry e;
TQStringList::Iterator it = added.find(nClass->name());
@@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
if (classname.isEmpty()) {
TQValueList<FunctionCompletionEntry>::Iterator it;
for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) {
- if((*it).text.tqstartsWith(function, FALSE)){
+ if((*it).text.startsWith(function, FALSE)){
KTextEditor::CompletionEntry e;
e = (*it);
list.append(e);
@@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
FunctionList methodList = m_model->globalNamespace()->functionList();
FunctionList::Iterator methodIt;
for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
- if ((*methodIt)->name().tqstartsWith(function, FALSE)){
+ if ((*methodIt)->name().startsWith(function, FALSE)){
KTextEditor::CompletionEntry e;
e.text = (*methodIt)->name();
ArgumentDom pArg = (*methodIt)->argumentList().first();
@@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
FunctionList::Iterator methodIt;
for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
FunctionDom pMethod = *methodIt;
- if (function.isEmpty() || pMethod->name().tqstartsWith(function, FALSE)) {
+ if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) {
KTextEditor::CompletionEntry e;
ArgumentDom arg = pMethod->argumentList().first();
@@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
VariableList::Iterator attrIt;
for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) {
VariableDom pVar = *attrIt;
- if (function.isEmpty() || pVar->name().tqstartsWith(function, FALSE)) {
+ if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) {
KTextEditor::CompletionEntry e;
e.prefix = nClass->name() + " ::";
e.text = pVar->name();
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 962ac2a9..c136780e 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -272,7 +272,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>171</height>
@@ -318,7 +318,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -366,7 +366,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="name">
<cstring>exe_button</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>0</height>
@@ -426,7 +426,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
@@ -472,7 +472,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
@@ -497,7 +497,7 @@ the internal web browser. Please make sure that the webserver was compiled with
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>343</height>
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 974698d3..d54028da 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -418,7 +418,7 @@ void PHPFile::ParseSource() {
include_path.append(URLUtil::directory(fileName()) + "/");
include_path.append("");
- TQStringList list = includere.tqcapturedTexts();
+ TQStringList list = includere.capturedTexts();
for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) {
TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]);
diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui
index c4f26dfb..ea40dbf3 100644
--- a/languages/php/phpinfodlg.ui
+++ b/languages/php/phpinfodlg.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui
index 5ddb336a..94c18baa 100644
--- a/languages/php/phpnewclassdlgbase.ui
+++ b/languages/php/phpnewclassdlgbase.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/python/README.dox b/languages/python/README.dox
index 339976a3..1d5f55c9 100644
--- a/languages/python/README.dox
+++ b/languages/python/README.dox
@@ -14,7 +14,7 @@ and images.
\maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a>
\feature Python support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui
index af04041b..7c70ed62 100644
--- a/languages/python/pythonconfigwidgetbase.ui
+++ b/languages/python/pythonconfigwidgetbase.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 39e635b3..867fc7ff 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -100,7 +100,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context)
{
m_contextFileName = url.fileName();
int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
- popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+ popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
}
}
}
diff --git a/languages/ruby/README.dox b/languages/ruby/README.dox
index 89dd9058..aaa8823b 100644
--- a/languages/ruby/README.dox
+++ b/languages/ruby/README.dox
@@ -9,7 +9,7 @@ This is a Ruby support plugin
\feature .rb template for New File
\feature Ruby project template for Application Wizard
\feature "Run" option in menu
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui
index 46a35473..03af967a 100644
--- a/languages/ruby/app_templates/kxt/prefs-base.ui
+++ b/languages/ruby/app_templates/kxt/prefs-base.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h
index 9f3a79fc..953eaca8 100644
--- a/languages/ruby/debugger/dbgcontroller.h
+++ b/languages/ruby/debugger/dbgcontroller.h
@@ -151,7 +151,7 @@ signals:
void rdbStdout (const char *output);
void rdbStderr (const char *output);
void showStepInSource (const TQString &fileName, int lineNum, const TQString &address);
- void dbgtqStatus (const TQString &status, int statusFlag);
+ void dbgStatus (const TQString &status, int statusFlag);
protected:
KProcess *dbgProcess_;
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index bc02d7aa..ff29a6c7 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -64,8 +64,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
heading_->setFont(KGlobalSettings::fixedFont());
heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
- heading_->setMaximumHeight(heading_->tqsizeHint().height());
-// heading_->setMinimumSize(heading_->tqsizeHint());
+ heading_->setMaximumHeight(heading_->sizeHint().height());
+// heading_->setMinimumSize(heading_->sizeHint());
topLayout->addWidget(heading_, 5);
topLayout->addWidget(pids_, 5);
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 3b13b148..f4e63c64 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -126,7 +126,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
offset_ = parentWidget()->pos() - e->globalPos();
setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
- setPalette(TQPalette(tqcolorGroup().background()));
+ setPalette(TQPalette(colorGroup().background()));
tqrepaint();
}
}
@@ -140,7 +140,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
offset_ = TQPoint(0,0);
setFrameStyle(TQFrame::Panel|TQFrame::Raised);
TQApplication::restoreOverrideCursor();
- setPalette(TQPalette(tqcolorGroup().background()));
+ setPalette(TQPalette(colorGroup().background()));
tqrepaint();
}
@@ -168,7 +168,7 @@ public:
DbgToolBar *parent, const char *name=0);
virtual ~DbgButton() {};
void drawButtonLabel(TQPainter *painter);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
private:
TQPixmap pixmap_;
@@ -197,19 +197,19 @@ void DbgButton::drawButtonLabel(TQPainter *painter)
painter->drawPixmap(x, y, pixmap_);
if (hasText) {
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text());
}
}
// **************************************************************************
-TQSize DbgButton::tqsizeHint() const
+TQSize DbgButton::sizeHint() const
{
if (text().isEmpty())
return pixmap_.size();
else
- return TQPushButton::tqsizeHint();
+ return TQPushButton::sizeHint();
}
// **************************************************************************
@@ -351,12 +351,12 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
nextLayout->addWidget(bNext);
-// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width());
-// w = TQMAX(w, bInterrupt->tqsizeHint().width());
-// w = TQMAX(w, bView->tqsizeHint().width());
+// int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width());
+// w = TQMAX(w, bInterrupt->sizeHint().width());
+// w = TQMAX(w, bView->sizeHint().width());
// they should have the same height, so don't be too fussy
-// int h = bFinish->tqsizeHint().height();
+// int h = bFinish->sizeHint().height();
//
// bNext->setMinimumHeight(h);
// bNexti->setMinimumHeight(h);
@@ -390,10 +390,10 @@ void DbgToolBar::slotKdevFocus()
// If anyone has a way of determining what window the app is _actually_ running on
// then please fix and send a patch.
- if (winModule_->activeWindow() != tqtopLevelWidget()->winId())
+ if (winModule_->activeWindow() != topLevelWidget()->winId())
activeWindow_ = winModule_->activeWindow();
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
}
// **************************************************************************
@@ -407,7 +407,7 @@ void DbgToolBar::slotPrevFocus()
// If the app is active then the app button is highlighted, otherwise
// kdev button is highlighted.
-void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
+void DbgToolBar::slotDbgStatus(const TQString&, int state)
{
bool appIndicator = state & s_appBusy;
if (appIndicator != appIsActive_) {
@@ -421,11 +421,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
void DbgToolBar::setAppIndicator(bool appIndicator)
{
if (appIndicator) {
- bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
- bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
+ bPrevFocus_->setPalette(TQPalette(colorGroup().mid()));
+ bKDevFocus_->setPalette(TQPalette(colorGroup().background()));
} else {
- bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
- bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
+ bPrevFocus_->setPalette(TQPalette(colorGroup().background()));
+ bKDevFocus_->setPalette(TQPalette(colorGroup().mid()));
}
}
@@ -473,7 +473,7 @@ void DbgToolBar::slotActivateAndUndock()
if (!docked_)
return;
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
slotUndock();
}
diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h
index 5b3cc649..f82b2133 100644
--- a/languages/ruby/debugger/dbgtoolbar.h
+++ b/languages/ruby/debugger/dbgtoolbar.h
@@ -64,7 +64,7 @@ public:
virtual ~DbgToolBar();
private slots:
- void slotDbgtqStatus(const TQString&, int);
+ void slotDbgStatus(const TQString&, int);
void slotDock();
void slotUndock();
void slotIconifyAndDock();
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 2d6437fe..c93f3cf7 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -312,16 +312,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (econtext->url().isLocalFile())
{
int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) );
- popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
+ popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
}
if (!m_contextIdent.isEmpty())
{
TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
int id = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), this, TQT_SLOT(contextWatch()) );
- popup->tqsetWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
+ popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
id = popup->insertItem( i18n("Inspect: %1").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
- popup->tqsetWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
+ popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
}
}
@@ -412,8 +412,8 @@ void RubyDebuggerPart::setupController()
// controller -> this
- connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
- this, TQT_SLOT(slottqStatus(const TQString&, int)));
+ connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
+ this, TQT_SLOT(slotStatus(const TQString&, int)));
connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
this, TQT_SLOT(slotShowStep(const TQString&, int)));
@@ -428,8 +428,8 @@ void RubyDebuggerPart::setupController()
rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) );
connect( controller, TQT_SIGNAL(rdbStderr(const char*)),
rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) );
- connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
- rdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int)));
+ connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
+ rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int)));
}
@@ -683,7 +683,7 @@ void RubyDebuggerPart::slotRefreshBPState( const Breakpoint& BP)
}
-void RubyDebuggerPart::slottqStatus(const TQString &msg, int state)
+void RubyDebuggerPart::slotStatus(const TQString &msg, int state)
{
TQString stateIndicator;
diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h
index 61558bb1..cdae0880 100644
--- a/languages/ruby/debugger/debuggerpart.h
+++ b/languages/ruby/debugger/debuggerpart.h
@@ -76,7 +76,7 @@ private slots:
void slotStepOut();
void slotRefreshBPState(const Breakpoint&);
- void slottqStatus(const TQString &msg, int state);
+ void slotStatus(const TQString &msg, int state);
void slotShowStep(const TQString &fileName, int lineNum);
void slotGotoSource(const TQString &fileName, int lineNum);
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index 03d42788..f9aaac7e 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -56,7 +56,7 @@ enum Column {
Control = 0,
Enable = 1,
Type = 2,
- tqStatus = 3,
+ Status = 3,
Location = 4
};
@@ -149,7 +149,7 @@ void BreakpointTableRow::setRow()
TQString status=m_breakpoint->statusDisplay(m_activeFlag);
- table()->setText(row(), tqStatus, status);
+ table()->setText(row(), Status, status);
TQString displayType = m_breakpoint->displayType();
table()->setText(row(), Location, m_breakpoint->location());
@@ -159,7 +159,7 @@ void BreakpointTableRow::setRow()
table()->setText(row(), Type, displayType);
table()->adjustColumn(Type);
- table()->adjustColumn(tqStatus);
+ table()->adjustColumn(Status);
table()->adjustColumn(Location);
}
}
@@ -221,14 +221,14 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
m_table->hideColumn(Control);
m_table->setColumnReadOnly(Type, true);
- m_table->setColumnReadOnly(tqStatus, true);
+ m_table->setColumnReadOnly(Status, true);
m_table->setColumnWidth( Enable, 20);
TQHeader *header = m_table->horizontalHeader();
header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") );
- header->setLabel( tqStatus, i18n("Status") );
+ header->setLabel( Status, i18n("Status") );
header->setLabel( Location, i18n("Location") );
m_table->show();
@@ -773,7 +773,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col)
}
case Type:
- case tqStatus:
+ case Status:
default:
break;
}
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index d98695af..ddf2ed7d 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -236,7 +236,7 @@ void RDBController::executeCmd()
emit rdbStdout( prettyCmd.latin1() );
if (!stateIsOn(s_silent))
- emit dbgtqStatus("", state_);
+ emit dbgStatus("", state_);
}
// **************************************************************************
@@ -301,7 +301,7 @@ void RDBController::actOnProgramPause(const TQString &msg)
if (stateIsOn(s_silent))
return;
- emit dbgtqStatus (msg, state_);
+ emit dbgStatus (msg, state_);
// We're always at frame one when the program stops
// and we must reset the active flag
@@ -348,7 +348,7 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox)
if (msgBox)
KMessageBox::error(0, i18n("rdb message:\n")+msg);
- emit dbgtqStatus (msg, state_);
+ emit dbgStatus (msg, state_);
}
// **************************************************************************
@@ -396,7 +396,7 @@ void RDBController::parseProgramLocation(char *buf)
if (stateIsOn(s_appBusy))
actOnProgramPause(i18n("No source: %1").tqarg(sourceFile));
else
- emit dbgtqStatus (i18n("No source: %1").tqarg(sourceFile), state_);
+ emit dbgStatus (i18n("No source: %1").tqarg(sourceFile), state_);
}
// **************************************************************************
@@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf)
}
}
- emit dbgtqStatus(i18n("No source: %1").tqarg(sourceFile), state_);
+ emit dbgStatus(i18n("No source: %1").tqarg(sourceFile), state_);
}
// **************************************************************************
@@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf)
{
if (!stateIsOn(s_silent)) {
emit showStepInSource("", -1, "");
- emit dbgtqStatus (i18n("No source: %1").tqarg(TQString(buf)), state_);
+ emit dbgStatus (i18n("No source: %1").tqarg(TQString(buf)), state_);
}
}
@@ -797,7 +797,7 @@ void RDBController::slotStopDebugger()
start = TQTime::currentTime();
while (-1)
{
- kapp->tqprocessEvents(20);
+ kapp->processEvents(20);
now = TQTime::currentTime();
if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000)
break;
@@ -816,7 +816,7 @@ void RDBController::slotStopDebugger()
start = TQTime::currentTime();
while (-1)
{
- kapp->tqprocessEvents(20);
+ kapp->processEvents(20);
now = TQTime::currentTime();
if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000)
break;
@@ -833,7 +833,7 @@ void RDBController::slotStopDebugger()
delete tty_; tty_ = 0;
state_ = s_dbgNotStarted | s_appNotStarted | s_silent;
- emit dbgtqStatus (i18n("Debugger stopped"), state_);
+ emit dbgStatus (i18n("Debugger stopped"), state_);
}
@@ -1175,7 +1175,7 @@ void RDBController::slotDbgWroteStdin(KProcess *)
{
// setStateOff(s_waitForWrite);
// if (!stateIsOn(s_silent))
- // emit dbgtqStatus ("", state_);
+ // emit dbgStatus ("", state_);
// executeCmd();
}
@@ -1203,7 +1203,7 @@ void RDBController::slotAcceptConnection(int masterSocket)
this, TQT_SLOT(slotReadFromSocket(int)) );
setStateOff(s_dbgNotStarted);
- emit dbgtqStatus ("", state_);
+ emit dbgStatus ("", state_);
cmdList_.clear();
rdbOutputLen_ = 0;
@@ -1283,7 +1283,7 @@ void RDBController::slotDbgProcessExited(KProcess*)
{
destroyCmds();
state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown));
- emit dbgtqStatus (i18n("Process exited"), state_);
+ emit dbgStatus (i18n("Process exited"), state_);
emit rdbStdout("(rdb:1) Process exited\n");
frameStack_->clear();
varTree_->clear();
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index ea249fe2..5e67752d 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -65,7 +65,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
userRDBCmdEntry->setStretchFactor(m_userRDBCmdEditor, 1);
m_Interrupt = new TQToolButton( this, "add breakpoint" );
- m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
+ m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
( TQSizePolicy::SizeType)0,
0,
0,
@@ -79,7 +79,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
topLayout->addWidget(m_rdbView, 10);
topLayout->addLayout(userRDBCmdEntry);
- slotDbgtqStatus( "", s_dbgNotStarted);
+ slotDbgStatus( "", s_dbgNotStarted);
connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) );
connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto()));
@@ -133,7 +133,7 @@ void RDBOutputWidget::slotRDBCmd()
/***************************************************************************/
-void RDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag)
+void RDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag)
{
if (statusFlag & s_dbgNotStarted)
{
diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h
index 7655bf19..dd95913d 100644
--- a/languages/ruby/debugger/rdboutputwidget.h
+++ b/languages/ruby/debugger/rdboutputwidget.h
@@ -48,7 +48,7 @@ public:
public slots:
void slotReceivedStdout(const char* line);
void slotReceivedStderr(const char* line);
- void slotDbgtqStatus (const TQString &status, int statusFlag);
+ void slotDbgStatus (const TQString &status, int statusFlag);
void slotRDBCmd();
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 2dd28b31..289b2811 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -428,7 +428,7 @@ void VariableTree::maybeTip(const TQPoint &p)
{
VarItem * item = dynamic_cast<VarItem*>( itemAt(p) );
if (item != 0) {
- TQRect r = tqitemRect(item);
+ TQRect r = itemRect(item);
if (r.isValid()) {
tip(r, item->tipText());
}
diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui
index bbddef8c..3487dbe7 100644
--- a/languages/ruby/rubyconfigwidgetbase.ui
+++ b/languages/ruby/rubyconfigwidgetbase.ui
@@ -158,7 +158,7 @@ def cd(dir) Dir.chdir dir end</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -321,7 +321,7 @@ def cd(dir) Dir.chdir dir end</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 0cee14b2..4ccc54e5 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context
{
m_contextFileName = url.fileName();
int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
- popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+ popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
}
}
}
diff --git a/languages/sql/README.dox b/languages/sql/README.dox
index 8642d2b4..14634fba 100644
--- a/languages/sql/README.dox
+++ b/languages/sql/README.dox
@@ -6,7 +6,7 @@ This is a SQL support plugin
\maintainer <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a>
\feature SQL language support
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
\bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
..
diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui
index e8be196f..18b37baa 100644
--- a/languages/sql/sqlconfigwidget.ui
+++ b/languages/sql/sqlconfigwidget.ui
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 81098a85..57753b13 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -183,10 +183,10 @@ static TQString dbCaption(const TQSqlDatabase* db)
if (!db)
return res;
res = db->driverName();
- res += TQString::tqfromLatin1("@");
+ res += TQString::fromLatin1("@");
res += db->hostName();
if (db->port() >= 0)
- res += TQString::tqfromLatin1(":") + TQString::number(db->port());
+ res += TQString::fromLatin1(":") + TQString::number(db->port());
return res;
}
#endif
diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h
index 95604c83..a3f7711b 100644
--- a/lib/catalog/tag.h
+++ b/lib/catalog/tag.h
@@ -122,7 +122,7 @@ public:
data->fileName = fileName;
}
- TQString path( const TQString& sep = TQString::tqfromLatin1("::") ) const
+ TQString path( const TQString& sep = TQString::fromLatin1("::") ) const
{
TQString s = scope().join( sep );
if( s.isNull() )
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index e4e3cf5d..326ee625 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -474,7 +474,7 @@ TQString ClassOrNamespaceNameAST::text() const
TQString str = m_name->text();
if( m_templateArgumentList.get() )
- str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+ str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
return str;
}
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 1ed9fca7..c19408e6 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -393,14 +393,14 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
}
if( stringify ) {
- textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") );
+ textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") );
} else if( merge ){
textToInsert.truncate( textToInsert.length() - 1 );
- textToInsert.append( str.str() + TQString::tqfromLatin1(" ") );
+ textToInsert.append( str.str() + TQString::fromLatin1(" ") );
} else if( tok == Token_ellipsis && d->hasBind("...") ){
textToInsert.append( ellipsisArg );
} else {
- textToInsert.append( str.str() + TQString::tqfromLatin1(" ") );
+ textToInsert.append( str.str() + TQString::fromLatin1(" ") );
}
}
diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp
index 7f420cac..cbe8640d 100644
--- a/lib/cppparser/lexercache.cpp
+++ b/lib/cppparser/lexercache.cpp
@@ -112,13 +112,13 @@ TQDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName
FileModificationMap::const_iterator it = m_fileModificationCache.find( fileName );
if( it != m_fileModificationCache.end() ) {
///Use the cache for 10 seconds
- if( (*it).second.m_readTime.secsTo( m_tqcurrentDateTime ) < 10 ) {
+ if( (*it).second.m_readTime.secsTo( m_currentDateTime ) < 10 ) {
return (*it).second.m_modificationTime;
}
}
TQFileInfo fileInfo( fileName.str() );
- m_fileModificationCache[fileName].m_readTime = TQDateTime::tqcurrentDateTime();
+ m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime();
m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified();
return fileInfo.lastModified();
@@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const {
}
void LexerCache::initFileModificationCache() {
- m_tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+ m_currentDateTime = TQDateTime::currentDateTime();
}
void LexerCache::saveMemory() {
diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h
index 535768bc..c1aac432 100644
--- a/lib/cppparser/lexercache.h
+++ b/lib/cppparser/lexercache.h
@@ -155,7 +155,7 @@ class LexerCache : public CacheManager {
typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap;
FileModificationMap m_fileModificationCache;
Driver* m_driver;
- TQDateTime m_tqcurrentDateTime;
+ TQDateTime m_currentDateTime;
};
diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h
index ee30f555..76dff18b 100644
--- a/lib/interfaces/extensions/kdevcreatefile.h
+++ b/lib/interfaces/extensions/kdevcreatefile.h
@@ -54,7 +54,7 @@ public:
public:
/**The status of a file.*/
- enum tqStatus {
+ enum Status {
STATUS_OK /**<File was successfuly created.*/,
STATUS_CANCELED /**<File was not created due to user intervention.*/,
STATUS_NOTCREATED /**<File was not created due to error.*/,
@@ -105,7 +105,7 @@ public:
there are several file templates for each extension.*/
TQString subtype;
/**Current status.*/
- tqStatus status;
+ Status status;
/**true if the file should be added to a project.*/
bool addToProject;
};
diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h
index 2dcfe869..01fc6115 100644
--- a/lib/interfaces/extensions/kdevversioncontrol.h
+++ b/lib/interfaces/extensions/kdevversioncontrol.h
@@ -198,7 +198,7 @@ public:
This is a <b>synchronous operation</b> (blocking).
@param dirPath The relative (to project dir) directory path to stat.
- @return tqStatus for all <b>registered</b> files.*/
+ @return Status for all <b>registered</b> files.*/
virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0;
/**Starts a request for directory status to the remote repository.
@@ -214,14 +214,14 @@ public:
@param checkRepos If true, contact remote repository and augment repository's status.
If false, retrieve only for local modification information.
@return true if the request has been successfully started, false otherwise.*/
- virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
+ virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
signals:
/**Emitted when the status request to remote repository has finished.
@param fileInfoMap The status for <b>registered in repository</b> files.
@param callerData The pointer to some data you want the provider will return
to you when it has done
- @see requesttqStatus for to find out when this signal should be used.*/
+ @see requestStatus for to find out when this signal should be used.*/
void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData);
protected:
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index 9f0c0064..c071f2db 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -91,7 +91,7 @@ signals:
/**Emitted when a form state is changed in the designer.
@param formName An absolute name of the form file.
@param status 0: form is clean, 1: form is modified.*/
- void newtqStatus(const TQString &formName, int status);
+ void newStatus(const TQString &formName, int status);
};
}
diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp
index 51845a5c..c0d1b106 100644
--- a/lib/util/blockingkprocess.cpp
+++ b/lib/util/blockingkprocess.cpp
@@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm)
void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen)
{
- m_stdOut += TQString::tqfromLatin1(buffer, buflen);
+ m_stdOut += TQString::fromLatin1(buffer, buflen);
}
void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen)
{
- m_stdErr += TQString::tqfromLatin1(buffer, buflen);
+ m_stdErr += TQString::fromLatin1(buffer, buflen);
}
void BlockingKProcess::slotProcessExited(KProcess *)
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index e0425614..ac4b018c 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -69,8 +69,8 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
TQString email = DomUtil::readEntry(dom, "/general/email");
TQString version = DomUtil::readEntry(dom, "/general/version");
TQString appname = DomUtil::readEntry(dom, "/general/projectname");
- TQString date = TQDate::tqcurrentDate().toString();
- TQString year = TQString::number(TQDate::tqcurrentDate().year());
+ TQString date = TQDate::currentDate().toString();
+ TQString year = TQString::number(TQDate::currentDate().year());
TQString str = text;
str.replace(TQRegExp("\\$EMAIL\\$"),email);
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index f91c91f0..c9087942 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config )
if ( useKDESetting )
{
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
- terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole"));
}
else
{
- terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole"));
+ terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole"));
}
return terminal;
}
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index 038d7936..a9a35069 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -72,7 +72,7 @@ void FlagListToolTip::maybeTip(const TQPoint &pos)
FlagListItem *flitem = static_cast<FlagListItem*>(item);
if (item)
- tip(listbox->tqitemRect(item), flitem->desc);
+ tip(listbox->itemRect(item), flitem->desc);
}
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 1b4cb3ab..1566a3e7 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status)
}
-TQSize ProcessWidget::tqminimumSizeHint() const
+TQSize ProcessWidget::minimumSizeHint() const
{
- // I'm not sure about this, but when I don't use override tqminimumSizeHint(),
+ // I'm not sure about this, but when I don't use override minimumSizeHint(),
// the initial size in clearly too small
- return TQSize( TQListBox::tqsizeHint().width(),
+ return TQSize( TQListBox::sizeHint().width(),
(fontMetrics().lineSpacing()+2)*4 );
}
diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h
index 5c33dd86..814db870 100644
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@@ -109,7 +109,7 @@ signals:
void rowSelected(int row);
protected:
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void maybeScrollToBottom();
protected slots:
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index 4a12d575..f3bd2673 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -36,7 +36,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQCheckBox(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp
index bb927a08..4b6ae5c4 100644
--- a/lib/widgets/propeditor/pcolorbutton.cpp
+++ b/lib/widgets/propeditor/pcolorbutton.cpp
@@ -45,7 +45,7 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char
connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor()));
#endif
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
}
diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp
index b0c82de3..23c61f46 100644
--- a/lib/widgets/propeditor/pcolorcombo.cpp
+++ b/lib/widgets/propeditor/pcolorcombo.cpp
@@ -31,7 +31,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KColorCombo(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index fa21678b..7f0d242e 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -40,7 +40,7 @@ void PComboBox::init(bool rw)
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQComboBox(rw, this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
fillBox();
diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp
index 64bbde18..ed83dbb2 100644
--- a/lib/widgets/propeditor/pdateedit.cpp
+++ b/lib/widgets/propeditor/pdateedit.cpp
@@ -30,7 +30,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQDateEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp
index 59df2440..3b8993d3 100644
--- a/lib/widgets/propeditor/pdatetimeedit.cpp
+++ b/lib/widgets/propeditor/pdatetimeedit.cpp
@@ -29,7 +29,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQDateTimeEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp
index e48475de..753af410 100644
--- a/lib/widgets/propeditor/pdoublenuminput.cpp
+++ b/lib/widgets/propeditor/pdoublenuminput.cpp
@@ -43,7 +43,7 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons
m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this );
connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
#endif
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
/* m_edit->setMinValue(-999999999);
m_edit->setMaxValue(+999999999);
m_edit->setPrecision(2);*/
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index e54e401f..82a96e9c 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -38,7 +38,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char*
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KFontRequester(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
#ifndef PURE_QT
m_edit->button()->setText(i18n("..."));
#endif
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 51b44e8c..8b0ee7a7 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -38,7 +38,7 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KFontCombo(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
/*adymo: KFontCombo seems to have a bug: when it is not editable, the signals
diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp
index 2c4fabc9..f5e1ecb0 100644
--- a/lib/widgets/propeditor/plineedit.cpp
+++ b/lib/widgets/propeditor/plineedit.cpp
@@ -29,7 +29,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp
index a47dc614..996b1d0e 100644
--- a/lib/widgets/propeditor/plinestyleedit.cpp
+++ b/lib/widgets/propeditor/plinestyleedit.cpp
@@ -131,7 +131,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQComboBox(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
m_edit->insertItem(TQPixmap(nopen));
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index 20f943e8..bd8af048 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -46,7 +46,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char*
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQLabel(this);
- m_edit->tqsetAlignment(TQt::AlignTop);
+ m_edit->setAlignment(TQt::AlignTop);
m_edit->resize(width(), height()-1);
m_edit->setBackgroundMode(TQt::PaletteBase);
m_edit->installEventFilter(this);
@@ -54,7 +54,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char*
m_button = new TQPushButton(i18n("..."), this);
m_button->resize(height(), height()-8);
m_button->move(width() - m_button->width() -1, 0);
- m_button->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
+ m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
l->addWidget(m_edit);
l->addWidget(m_button);
m_popup = new TQLabel(0, 0, TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop);
diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp
index 4e85d214..64a823a9 100644
--- a/lib/widgets/propeditor/ppointedit.cpp
+++ b/lib/widgets/propeditor/ppointedit.cpp
@@ -29,7 +29,7 @@ PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* na
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
m_edit->setReadOnly(true);
diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp
index d7a5fa01..dbc35ae5 100644
--- a/lib/widgets/propeditor/prectedit.cpp
+++ b/lib/widgets/propeditor/prectedit.cpp
@@ -29,7 +29,7 @@ PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
m_edit->setReadOnly(true);
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index ed7b81f2..4c5c8b16 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -196,7 +196,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
#else
m_undoButton->setPixmap( TQPixmap("undo.xpm") );
#endif
- m_undoButton->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+ m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
m_undoButton->resize(m_undoButton->height(), m_undoButton->height());
m_undoButton->hide();
connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo()));
@@ -360,11 +360,11 @@ void PropertyEditor::showEditor(PropertyItem *item)
void PropertyEditor::placeEditor(PropertyItem *item)
{
- TQRect r = tqitemRect(item);
+ TQRect r = itemRect(item);
if (!r.size().isValid())
{
ensureItemVisible(item);
- r = tqitemRect(item);
+ r = itemRect(item);
}
r.setX(header()->sectionPos(1));
@@ -447,7 +447,7 @@ Machine *PropertyEditor::machine(MultiProperty *property)
m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property);
connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)),
this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&)));
- m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->tqchildrenRect().topLeft());
+ m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft());
m_registeredForType[name]->propertyEditor->hide();
}
return m_registeredForType[name];
diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp
index 5558c3f3..c4d28402 100644
--- a/lib/widgets/propeditor/psizeedit.cpp
+++ b/lib/widgets/propeditor/psizeedit.cpp
@@ -30,7 +30,7 @@ PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
m_edit->setReadOnly(true);
diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp
index 94847d2a..d9ec7869 100644
--- a/lib/widgets/propeditor/psizepolicyedit.cpp
+++ b/lib/widgets/propeditor/psizepolicyedit.cpp
@@ -31,7 +31,7 @@ PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString,
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
m_edit->setReadOnly(true);
diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp
index e9c25325..755041c1 100644
--- a/lib/widgets/propeditor/pspinbox.cpp
+++ b/lib/widgets/propeditor/pspinbox.cpp
@@ -31,7 +31,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name)
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp
index fda16a8b..b6f4b74e 100644
--- a/lib/widgets/propeditor/pstringlistedit.cpp
+++ b/lib/widgets/propeditor/pstringlistedit.cpp
@@ -43,10 +43,10 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons
edit = new KLineEdit(this);
edit->setReadOnly(true);
- edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(edit);
pbSelect = new TQPushButton("...", this);
- pbSelect->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+ pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
l->addWidget(pbSelect);
connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor()));
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index 7e79945a..6116ca8c 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -40,11 +40,11 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
{
l = new TQHBoxLayout(this);
m_edit = new KLineEdit(this);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
m_edit->setMaxLength(1);
l->addWidget(m_edit);
m_select = new TQPushButton("...", this);
- m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+ m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
l->addWidget(m_select);
#ifdef PURE_QT
diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp
index df8316cd..047c9997 100644
--- a/lib/widgets/propeditor/purledit.cpp
+++ b/lib/widgets/propeditor/purledit.cpp
@@ -47,7 +47,7 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c
m_mode = mode;
connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select()));
#endif
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
}
TQVariant PUrlEdit::value() const
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 614b751b..308570be 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -37,7 +37,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQPushButton(this);
m_edit->setToggleButton(true);
- m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index fda5a006..ad3ab6c4 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -92,7 +92,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::MinimumExpanding));
TQWidget * gb = this;
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 2dcfb9f3..700344de 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -39,7 +39,7 @@ public:
QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb )
{
duplicatesEnabled = TRUE;
- cb->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+ cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
}
inline TQListView * listView() { return lView; }
@@ -68,7 +68,7 @@ public:
TQLineEdit * ed; // /bin/ed rules!
TQTimer *completionTimer;
- TQSize tqsizeHint;
+ TQSize sizeHint;
private:
bool usinglView;
@@ -81,7 +81,7 @@ void QComboViewData::updateLinedGeometry()
{
if ( !ed || !combo )
return;
- TQRect r = TQStyle::tqvisualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
+ TQRect r = TQStyle::visualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
TQStyle::SC_ComboBoxEditField), combo );
// qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1);
@@ -204,7 +204,7 @@ void QComboView::clear()
d->current = 0;
if ( d->ed ) {
- d->ed->setText( TQString::tqfromLatin1("") );
+ d->ed->setText( TQString::fromLatin1("") );
d->updateLinedGeometry();
}
currentChanged();
@@ -272,10 +272,10 @@ void QComboView::setAutoResize( bool enable )
the contents change dynamically. To tqinvalidate the cached value
call setFont().
*/
-TQSize QComboView::tqsizeHint() const
+TQSize QComboView::sizeHint() const
{
- if ( isVisible() && d->tqsizeHint.isValid() )
- return d->tqsizeHint;
+ if ( isVisible() && d->sizeHint.isValid() )
+ return d->sizeHint;
constPolish();
// int i, w;
@@ -290,10 +290,10 @@ TQSize QComboView::tqsizeHint() const
maxW = w;
}
*/
- d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
+ d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
- return d->tqsizeHint;
+ return d->sizeHint;
}
@@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette )
void QComboView::setFont( const TQFont &font )
{
- d->tqsizeHint = TQSize(); // tqinvalidate size hint
+ d->sizeHint = TQSize(); // tqinvalidate size hint
TQWidget::setFont( font );
d->listView()->setFont( font );
if (d->ed)
@@ -412,7 +412,7 @@ void QComboView::resizeEvent( TQResizeEvent * e )
void QComboView::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -428,7 +428,7 @@ void QComboView::paintEvent( TQPaintEvent * )
}
// bool reverse = TQApplication::reverseLayout();
- tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+ tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(d->arrowDown ?
TQStyle::SC_ComboBoxArrow :
@@ -436,7 +436,7 @@ void QComboView::paintEvent( TQPaintEvent * )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
- re = TQStyle::tqvisualRect(re, this);
+ re = TQStyle::visualRect(re, this);
p.setClipRect( re );
if ( !d->ed ) {
@@ -445,14 +445,14 @@ void QComboView::paintEvent( TQPaintEvent * )
// we calculate the TQListBoxTexts height (ignoring strut)
int itemh = d->listView()->fontMetrics().lineSpacing() + 2;
p.translate( re.x(), re.y() + (re.height() - itemh)/2 );
- item->paintCell( &p, d->listView()->tqcolorGroup(), 0, width(), AlignLeft | AlignVCenter );
+ item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter );
}
} else if ( d->listView() && d->listView()->currentItem( ) && d->current ) {
TQListViewItem * item = d->current ;
const TQPixmap *pix = item->pixmap(0);
if ( pix ) {
p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
- tqcolorGroup().brush( TQColorGroup::Base ) );
+ colorGroup().brush( TQColorGroup::Base ) );
p.drawPixmap( re.x() + 2, re.y() +
( re.height() - pix->height() ) / 2, *pix );
}
@@ -474,7 +474,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
}
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button.
@@ -700,12 +700,12 @@ static int listHeight( TQListView *l, int /*sl*/ )
prefH = ch * l->firstChild()->height();
}
else
- prefH = l->tqsizeHint().height();
+ prefH = l->sizeHint().height();
if (l->header()->isVisible())
- prefH += l->header()->tqsizeHint().height();
+ prefH += l->header()->sizeHint().height();
-// return prefH < l->tqsizeHint().height() ? prefH : l->tqsizeHint().height();
+// return prefH < l->sizeHint().height() ? prefH : l->sizeHint().height();
return prefH+2;
}
@@ -727,7 +727,7 @@ void QComboView::popup()
lb->installEventFilter( this );
lb->viewport()->installEventFilter( this );
d->mouseWasInsidePopup = FALSE;
-// int w = lb->variableWidth() ? lb->tqsizeHint().width() : width();
+// int w = lb->variableWidth() ? lb->sizeHint().width() : width();
int w = width();
int h = listHeight( lb, d->sizeLimit );
TQRect screen = TQApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) );
@@ -790,7 +790,7 @@ void QComboView::updateMask()
{
TQPainter p( &bm, this );
- tqstyle().tqdrawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
+ tqstyle().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
}
setMask( bm );
@@ -904,7 +904,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
TQRect arrowRect =
tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
if ( arrowRect.contains( comboPos ) ) {
if ( !d->arrowDown ) {
d->arrowDown = TRUE;
@@ -918,7 +918,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
}
}
} else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 &&
- tqstyle().tqstyleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
+ tqstyle().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
// qWarning("event filter:: emu");
TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE );
// if ( mouseW == d->listView()->viewport() ) { //###
@@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const
*/
void QComboView::styleChange( TQStyle& s )
{
- d->tqsizeHint = TQSize(); // tqinvalidate size hint...
+ d->sizeHint = TQSize(); // tqinvalidate size hint...
if ( d->ed )
d->updateLinedGeometry();
TQWidget::styleChange( s );
diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h
index ecfa8ee2..35eef4f1 100644
--- a/lib/widgets/qcomboview.h
+++ b/lib/widgets/qcomboview.h
@@ -68,7 +68,7 @@ public:
bool autoResize() const;
virtual void setAutoResize( bool );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void setPalette( const TQPalette & );
void setFont( const TQFont & );
diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui
index f53ec3df..fcce2dad 100644
--- a/parts/abbrev/abbrevconfigwidgetbase.ui
+++ b/parts/abbrev/abbrevconfigwidgetbase.ui
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui
index bab82762..b4a01258 100644
--- a/parts/abbrev/addtemplatedlgbase.ui
+++ b/parts/abbrev/addtemplatedlgbase.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index eb3fb4f6..8fa1c8a5 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -509,7 +509,7 @@ void AppWizardDialog::accept()
m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() );
m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text());
m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" );
- m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) );
+ m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) );
// This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE}
// and unsurprisingly, KAboutData doesn't cover every imaginable case.
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index 902be185..a7d39107 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -139,13 +139,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>180</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>180</height>
@@ -286,13 +286,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>32767</height>
@@ -491,7 +491,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>550</width>
<height>270</height>
diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index 29687ff9..957bb80d 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -276,7 +276,7 @@ will be the author, everything between
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 1357c774..3fed1fed 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -70,7 +70,7 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
strFill + " * $EMAIL$ *\n" +
strFill + " * *\n";
-// str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67);
+// str = str.tqarg(TQDate::currentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67);
TQStringList::Iterator it;
for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui
index 9ac7dba9..6bb59c93 100644
--- a/parts/appwizard/vcs_form.ui
+++ b/parts/appwizard/vcs_form.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index 4582fa4b..f94da081 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -62,13 +62,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -293,7 +293,7 @@ Can use * on its own for any file.</string>
<property name="name">
<cstring>FillingGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -380,7 +380,7 @@ Can use * on its own for any file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>34</width>
<height>21</height>
@@ -440,7 +440,7 @@ The number of spaces per tab is controled by the editor.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -455,7 +455,7 @@ The number of spaces per tab is controled by the editor.</string>
<property name="name">
<cstring>BracketGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -567,7 +567,7 @@ from their immediately preceding closing brackets.</string>
<property name="name">
<cstring>ContinueationGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -640,7 +640,7 @@ belonging to a conditional header.</string>
<property name="name">
<cstring>IndentGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -772,7 +772,7 @@ flushed completely to the left (which is the default).</string>
<property name="name">
<cstring>BlockGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -844,7 +844,7 @@ correctly.
<property name="name">
<cstring>PaddingGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -909,7 +909,7 @@ There is no unpad operator option.</string>
<property name="name">
<cstring>OneLinersGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui
index 5fe07a63..092cc754 100644
--- a/parts/bookmarks/bookmarks_settings_base.ui
+++ b/parts/bookmarks/bookmarks_settings_base.ui
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>240</height>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 304d40fd..e4fb531c 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p)
if ( ! _part->config()->toolTip() ) return;
BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) );
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() )
{
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index a30e0e11..77f76c51 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -41,37 +41,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
parents_button = new TQToolButton(this);
parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
parents_button->setToggleButton(true);
- parents_button->setFixedSize(parents_button->tqsizeHint());
+ parents_button->setFixedSize(parents_button->sizeHint());
TQToolTip::add(parents_button, i18n("Show parents"));
tqchildren_button = new TQToolButton(this);
tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
tqchildren_button->setToggleButton(true);
- tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint());
+ tqchildren_button->setFixedSize(tqchildren_button->sizeHint());
TQToolTip::add(tqchildren_button, i18n("Show tqchildren"));
clients_button = new TQToolButton(this);
clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
clients_button->setToggleButton(true);
- clients_button->setFixedSize(clients_button->tqsizeHint());
+ clients_button->setFixedSize(clients_button->sizeHint());
TQToolTip::add(clients_button, i18n("Show clients"));
suppliers_button = new TQToolButton(this);
suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
suppliers_button->setToggleButton(true);
- suppliers_button->setFixedSize(suppliers_button->tqsizeHint());
+ suppliers_button->setFixedSize(suppliers_button->sizeHint());
TQToolTip::add(suppliers_button, i18n("Show suppliers"));
methods_button = new TQToolButton(this);
methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
methods_button->setToggleButton(true);
- methods_button->setFixedSize(methods_button->tqsizeHint());
+ methods_button->setFixedSize(methods_button->sizeHint());
TQToolTip::add(methods_button, i18n("Show methods"));
attributes_button = new TQToolButton(this);
attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
attributes_button->setToggleButton(true);
- attributes_button->setFixedSize(attributes_button->tqsizeHint());
+ attributes_button->setFixedSize(attributes_button->sizeHint());
TQToolTip::add(attributes_button, i18n("Show attributes"));
access_combo = new TQComboBox(false, this, "access combo");
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index d057f6e0..a541251b 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -436,7 +436,7 @@ void ClassToolTip::maybeTip(const TQPoint &p)
ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
TQListViewItem *item = ctw->itemAt(p);
- TQRect r = ctw->tqitemRect(item);
+ TQRect r = ctw->itemRect(item);
if (item && r.isValid()) {
ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item);
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 20c8e8b1..95c2ae2c 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
kdDebug(0) << tooltip << endl;
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() && !tooltip.isEmpty() )
{
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index ba09e463..112435b5 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in
triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22));
triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22));
triangle[2] = p2;
- p->tqdrawPolygon(triangle, true);
+ p->drawPolygon(triangle, true);
}
}
@@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
}
-TQSize DigraphView::tqsizeHint() const
+TQSize DigraphView::sizeHint() const
{
if (width == -1)
return TQSize(100, 100); // arbitrary
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index 9130be75..cd25e279 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -42,7 +42,7 @@ signals:
protected:
virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph);
virtual void contentsMousePressEvent(TQMouseEvent *e);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private:
int toXPixel(double x);
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 0929c5cd..74f86a8a 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -41,10 +41,10 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
: TQDialog(0, "hierarchy dialog", false)
{
class_combo = new KComboView(true, 150, this);
- class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+ class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
// class_combo->setMinimumWidth(150);
namespace_combo = new KComboView(true, 150, this);
- namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+ namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
// namespace_combo->setMinimumWidth(150);
TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index 39202844..c6145eed 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index 3969a4f1..6bffedfe 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 2367f673..59c1ba32 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -290,7 +290,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index 99f150e7..19fc4b85 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index 7cb665ce..fe29ed51 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -21,13 +21,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -69,7 +69,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -91,13 +91,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -866,7 +866,7 @@ Build Files</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -885,7 +885,7 @@ Build Files</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -954,7 +954,7 @@ Build Files</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -993,7 +993,7 @@ Build Files</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1071,7 +1071,7 @@ Build Files</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 412f957e..438ac469 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -457,7 +457,7 @@ TQString DistpartDialog::getSourceName() {
name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz";
return name.replace(TQRegExp("%n"),getappNameFormatLineEditText())
.replace(TQRegExp("%v"),getversionLineEditText())
- .replace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd"));
+ .replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd"));
}
void DistpartDialog::loadSettings() {
diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui
index 699361be..77c7f613 100644
--- a/parts/documentation/addcatalogdlgbase.ui
+++ b/parts/documentation/addcatalogdlgbase.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>18</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index b073b6ee..e2a176dd 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>190</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -265,7 +265,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui
index 3476d07a..d1c52d8c 100644
--- a/parts/documentation/docprojectconfigwidgetbase.ui
+++ b/parts/documentation/docprojectconfigwidgetbase.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 9585c4e7..2d3afa95 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -125,7 +125,7 @@ DocumentationPart::~DocumentationPart()
void DocumentationPart::loadDocumentationPlugins()
{
KTrader::OfferList docPluginOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"),
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
@@ -347,13 +347,13 @@ void DocumentationPart::infoPage()
void DocumentationPart::manPage(const TQString &term)
{
- TQString url = TQString::tqfromLatin1("man:/%1").tqarg(term);
+ TQString url = TQString::fromLatin1("man:/%1").tqarg(term);
partController()->showDocument(KURL(url));
}
void DocumentationPart::infoPage(const TQString &term)
{
- TQString url = TQString::tqfromLatin1("info:/%1").tqarg(term);
+ TQString url = TQString::fromLatin1("info:/%1").tqarg(term);
partController()->showDocument(KURL(url));
}
@@ -467,7 +467,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (hasContextFeature(Finder)) {
id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed),
this, TQT_SLOT(contextFindDocumentation()));
- popup->tqsetWhatsThis(id, i18n("<b>Find documentation</b><p>"
+ popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>"
"Opens the documentation finder tab and searches "
"all possible sources of documentation like "
"table of contents, index, man and info databases, "
@@ -476,7 +476,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (hasContextFeature(IndexLookup)) {
id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed),
this, TQT_SLOT(contextLookInDocumentationIndex()));
- popup->tqsetWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
+ popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
"Opens the documentation index tab. It allows "
"a term to be entered which will be looked for in "
"the documentation index."));
@@ -484,7 +484,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (hasContextFeature(FullTextSearch)) {
id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed),
this, TQT_SLOT(contextSearchInDocumentation()));
- popup->tqsetWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
+ popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
"for a term under the cursor in "
"the documentation. For this to work, "
"a full text index must be created first, which can be done in the "
@@ -493,12 +493,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (hasContextFeature(GotoMan)) {
id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed),
this, TQT_SLOT(contextManPage()));
- popup->tqsetWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
+ popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
}
if (hasContextFeature(GotoInfo)) {
id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed),
this, TQT_SLOT(contextInfoPage()) );
- popup->tqsetWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
+ popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
}
if (id != -1)
popup->insertSeparator();
diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui
index 6f5ea912..8d6ac359 100644
--- a/parts/documentation/editbookmarkdlg.ui
+++ b/parts/documentation/editbookmarkdlg.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui
index 8a064022..e7799a12 100644
--- a/parts/documentation/editcatalogdlgbase.ui
+++ b/parts/documentation/editcatalogdlgbase.ui
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 594c07c5..ac95d878 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* )
void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len)
{
- proc_info_out += TQString::tqfromLatin1( buf, len );
+ proc_info_out += TQString::fromLatin1( buf, len );
}
void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len)
{
- proc_man_out += TQString::tqfromLatin1( buf, len );
+ proc_man_out += TQString::fromLatin1( buf, len );
}
void FindDocumentation::searchInInfo()
diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui
index 4321cea0..5d85bdf1 100644
--- a/parts/documentation/find_documentation_optionsbase.ui
+++ b/parts/documentation/find_documentation_optionsbase.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui
index 7cc11627..aa144ba4 100644
--- a/parts/documentation/find_documentationbase.ui
+++ b/parts/documentation/find_documentationbase.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index a7db4555..d294db6f 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
p->fillRect(0, 0, width, height(), cg.brush(crole));
TQFontMetrics fm(lv->fontMetrics());
- int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int styleflags = TQStyle::Style_Default;
@@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
{
if ((c == 0) || (c == 1) || (c == 2))
- return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+ return lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
return TQListViewItem::width(fm, lv, c);
}
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 21b07207..09b81d72 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -138,7 +138,7 @@ static KListViewItem* chainEnd(KListViewItem *parent) {
}
static TQString decodeHTML(const TQString& s) {
- TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);|&nbsp;"));
+ TQRegExp rx(TQString::fromLatin1("&#(\\d+);|&nbsp;"));
TQString out = s;
int pos = rx.search(out);
while(pos > -1) {
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index e1528d03..1d7543c3 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
}
else
{
- path = TQString::tqfromLatin1("/");
+ path = TQString::fromLatin1("/");
}
kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl;
break;
diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui
index bf53e4a9..696d78ae 100644
--- a/parts/documentation/selecttopicbase.ui
+++ b/parts/documentation/selecttopicbase.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index c70f5df6..d9e138e8 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget()
}
-TQSize DoxygenConfigWidget::tqsizeHint() const
+TQSize DoxygenConfigWidget::sizeHint() const
{
// without this the whole dialog becomes much too large
- return TQSize(TQTabWidget::tqsizeHint().width(), 1);
+ return TQSize(TQTabWidget::sizeHint().width(), 1);
}
diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h
index 7c4a31e6..f4a6db38 100644
--- a/parts/doxygen/doxygenconfigwidget.h
+++ b/parts/doxygen/doxygenconfigwidget.h
@@ -38,7 +38,7 @@ private slots:
void changed();
private:
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void loadFile();
void saveFile();
void init();
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 93914a2f..90897630 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -68,7 +68,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla
AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 );
languageChange();
- resize( TQSize(511, 282).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(511, 282).expandedTo(minimumSizeHint()) );
// signals and slots connections
connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui
index 6302f05f..be039483 100644
--- a/parts/filecreate/fcconfigwidgetbase.ui
+++ b/parts/filecreate/fcconfigwidgetbase.ui
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -173,7 +173,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>20</height>
@@ -381,7 +381,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -406,7 +406,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index 371c37c9..2a8513ce 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -96,7 +96,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index faf18a37..2d44a4d8 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -125,7 +125,7 @@
<property name="name">
<cstring>icon_url</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
@@ -180,7 +180,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog
index e6be7b92..b61af20d 100644
--- a/parts/filecreate/file-templates/ui-confdialog
+++ b/parts/filecreate/file-templates/ui-confdialog
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb
index f369c82f..e02e5ea6 100644
--- a/parts/filecreate/file-templates/ui-dialogb
+++ b/parts/filecreate/file-templates/ui-dialogb
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index 4925e2dd..57cc1a9c 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -36,7 +36,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr
index 76b7f24e..f5d5ffad 100644
--- a/parts/filecreate/file-templates/ui-dialogr
+++ b/parts/filecreate/file-templates/ui-dialogr
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index 74dbf04c..1d3405eb 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -50,7 +50,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog
index f7447450..56ac7bd7 100644
--- a/parts/filecreate/file-templates/ui-tabdialog
+++ b/parts/filecreate/file-templates/ui-tabdialog
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index dc581ac3..0f33b216 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
}
void FileCreatePart::slotNoteFiletype(const FileType * filetype) {
- kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl;
+ kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl;
m_filedialogFiletype = filetype;
}
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 840d62b4..d934aba0 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -191,7 +191,7 @@ namespace FileCreate {
if( !i )
continue;
- TQSize size = i->tqsizeHint();
+ TQSize size = i->sizeHint();
maxHeight = size.height()>maxHeight ? size.height() : maxHeight;
}
setRowHeight(row,maxHeight+2); // bit of extra room
@@ -206,7 +206,7 @@ namespace FileCreate {
if( !i )
continue;
- TQSize size = item(r,col)->tqsizeHint();
+ TQSize size = item(r,col)->sizeHint();
maxWidth = size.width()>maxWidth ? size.width() : maxWidth;
}
setColumnWidth(col,maxWidth+2); // bit of extra room
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 223f53b6..4898440d 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -81,7 +81,7 @@ void FileListWidget::startRefreshTimer( )
void FileListWidget::maybeTip( TQPoint const & p )
{
FileListItem * item = static_cast<FileListItem*>( itemAt( p ) );
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() )
{
diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui
index f5ae5a6d..7e362f85 100644
--- a/parts/filelist/projectviewconfigbase.ui
+++ b/parts/filelist/projectviewconfigbase.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui
index 847e423d..eca292ad 100644
--- a/parts/filelist/projectviewprojectconfigbase.ui
+++ b/parts/filelist/projectviewprojectconfigbase.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>265</width>
<height>20</height>
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 04e09af1..06ceac88 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -105,7 +105,7 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
{
if (m_tb)
{
- setMinimumHeight(m_tb->tqsizeHint().height());
+ setMinimumHeight(m_tb->sizeHint().height());
m_tb->resize(width(),height());
}
}
@@ -136,7 +136,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
tqInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
cmbPath->setCompletionObject( cmpl );
lo->addWidget(cmbPath);
@@ -171,7 +171,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
btnFilter->setIconSet( SmallIconSet("filter" ) );
btnFilter->setToggleButton( true );
filter = new KHistoryCombo( true, filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
lo->addWidget(filterBox);
diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui
index 00687a21..01574b69 100644
--- a/parts/fileview/filegroupsconfigwidgetbase.ui
+++ b/parts/fileview/filegroupsconfigwidgetbase.ui
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 7efefd96..e0222eb5 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -228,7 +228,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const
popup.insertTitle(i18n("File Groups"));
/// @todo Add, remove groups
int customizeId = popup.insertItem(i18n("Customize..."));
- popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
+ popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
if (item) {
if (item->parent()) {
// Not for group items
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 2793a52b..f1b557f2 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt
if (item == fileTree()->firstChild() && canReloadTree())
{
int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) );
- popupMenu->tqsetWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
+ popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
}
m_actionToggleShowNonProjectFiles->plug( popupMenu );
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index 39177191..df1cdbd5 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -57,7 +57,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
m_btnFilter->setIconSet( SmallIconSet("filter" ) );
m_btnFilter->setToggleButton( true );
m_filter = new KHistoryCombo( true, filterBox, "filter");
- m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(m_filter, 2);
connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) );
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 0e102cd9..cae245dc 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -62,7 +62,7 @@ public:
void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); }
void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); }
void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); }
- void settqStatus( const VCSFileInfo::FileState status );
+ void setStatus( const VCSFileInfo::FileState status );
private:
TQColor *m_statusColor; // cached
@@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info )
//setFileName( info.fileName );
setRepositoryRev( info.repoRevision );
setWorkingRev( info.workRevision );
- settqStatus( info.state );
+ setStatus( info.state );
}
///////////////////////////////////////////////////////////////////////////////
-void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status )
+void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
{
setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) );
// Update color too
@@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem );
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem );
+ m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
m_isSyncingWithRepository = true;
}
@@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false );
+ m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
// m_isSyncingWithRepository = true;
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 18849f40..730e5a4b 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -125,7 +125,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
search_opts_layout->addWidget(regexp_box);
case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this);
- case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
case_sens_box->setChecked(config->readBoolEntry("case_sens", true));
search_opts_layout->addWidget(case_sens_box);
@@ -165,7 +165,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
dir_opts_layout->addWidget(recursive_box);
use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this);
- use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
use_project_box->setChecked(config->readBoolEntry("search_project_files", true));
dir_opts_layout->addWidget(use_project_box);
@@ -201,7 +201,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
other_opts_layout->addWidget(keep_output_box);
no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this);
- no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true));
other_opts_layout->addWidget(no_find_err_box);
@@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
button_layout->addWidget(search_button);
button_layout->addWidget(done_button);
- resize(tqsizeHint());
+ resize(sizeHint());
TQWhatsThis::add(pattern_combo,
i18n("<qt>Enter the regular expression you want to search for here.<p>"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 997723c1..527b13a4 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -118,7 +118,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
TQString squeezed = KStringHandler::csqueeze(ident, 30);
int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed),
this, TQT_SLOT(slotContextGrep()) );
- popup->tqsetWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
+ popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
popup->insertSeparator();
}
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 7fc1fcbe..c41d0ee6 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -50,7 +50,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
KPopupMenu * openAsPopup = new KPopupMenu( popup );
int id = popup->insertItem( i18n("Open As"), openAsPopup );
- popup->tqsetWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
+ popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
@@ -80,13 +80,13 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
}
id = popup->insertItem( i18n("Open With"), openWithPopup );
- popup->tqsetWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
+ popup->setWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
openWithPopup->insertSeparator();
// make sure the generic "Open with ..." entry gets appended to the submenu
id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog()));
- openWithPopup->tqsetWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
+ openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
}
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index 626187ca..efff1e1b 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line )
if( hasmatch )
{
// Add hacks for error strings you want excluded here
- if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
- || text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
+ if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+ || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 )
hasmatch = false;
}
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index cde1d552..114b98ac 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -87,8 +87,8 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
// we need a TQRegExp because KRegExp is not Utf8 aware.
// 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
- static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
- static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
+ static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
kdDebug(9004) << "Directory filter line " << line << endl;
// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
@@ -160,7 +160,7 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
// 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
- static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
// and the input required is very short if these strings match.
diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui
index 4faa7f58..6a315a70 100644
--- a/parts/outputviews/filterdlg.ui
+++ b/parts/outputviews/filterdlg.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 34618a97..f483ad7a 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -566,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *)
{
if (childproc->exitStatus())
{
- KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
+ KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
emit m_part->commandFailed(currentCommand);
}
else
{
- KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
+ KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
emit m_part->commandFinished(currentCommand);
}
}
@@ -700,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
pMenu->insertSeparator();
int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) );
pMenu->setItemChecked(id, m_bLineWrapping);
- pMenu->tqsetWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
+ pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
pMenu->insertSeparator();
id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
+ pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort);
id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
+ pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eShort);
id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
+ pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eFull);
pMenu->insertSeparator();
id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages()));
- pMenu->tqsetWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
+ pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages());
return pMenu;
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index a32aabb5..20728b19 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) );
if ( item )
{
- TQRect r = m_resultsList->tqitemRect( item );
+ TQRect r = m_resultsList->itemRect( item );
if ( r.isValid() )
tip( r, item->tipText() );
}
@@ -116,7 +116,7 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
m_resultsList->addColumn( i18n( "Property" ) );
m_resultsList->addColumn( i18n( "Type" ) );
m_resultsList->addColumn( i18n( "Value" ) );
- m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
+ m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
(TQSizePolicy::SizeType)3, 0, 0,
m_resultsList->sizePolicy().hasHeightForWidth() ) );
TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui
index f4281564..2537a710 100644
--- a/parts/quickopen/quickopenbase.ui
+++ b/parts/quickopen/quickopenbase.ui
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index 48f1d6b8..06217d14 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>261</width>
<height>31</height>
diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui
index fe6bb670..da4b7b95 100644
--- a/parts/regexptest/regexptestdlgbase.ui
+++ b/parts/regexptest/regexptestdlgbase.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index e808ab70..779ba401 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -101,7 +101,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context)
TQString squeezed = KStringHandler::csqueeze(ident, 30);
int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed),
this, TQT_SLOT(slotReplace()) );
- popup->tqsetWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
+ popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
popup->insertSeparator();
}
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index 1136e08a..f4a19103 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements()
}
++it;
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
m_part->core()->running( m_part, false );
@@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements()
}
fileitem = fileitem->nextSibling();
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
// Telling the project about the edited files
diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui
index 6a8b81f9..000a2a06 100644
--- a/parts/replace/replacedlg.ui
+++ b/parts/replace/replacedlg.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index 853c170d..ed3814d0 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
- if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
TQFontMetrics fm( lv->fontMetrics() );
- int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos )
{
TQListView * lv = listView();
TQCheckBox cb(0);
- int boxsize = cb.tqsizeHint().width();
-//that's KDE-3.1 only int boxsize = lv->style().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = cb.sizeHint().width();
+//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() );
// _lineclicked indicates if the click was on the line or in the checkbox
diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp
index 4d5c4b41..a7cc78ca 100644
--- a/parts/replace/replaceview.cpp
+++ b/parts/replace/replaceview.cpp
@@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po
else if ( btn == Qt::LeftButton )
{
// map pos to item/column and call ReplacetItem::activate(pos)
- item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) );
+ item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) );
}
}
}
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 0501ecd9..496746b2 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -86,8 +86,8 @@ void scriptingPart::setupActions()
KConfig *cfg = kapp->config();
searchDirs += cfg->readListEntry("SearchDirs");
- unplugActionList(TQString::tqfromLatin1( "script_actions" ));
- plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
+ unplugActionList(TQString::fromLatin1( "script_actions" ));
+ plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
}
void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index 4d847f01..ba7ceca1 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -112,8 +112,8 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
TQStringList SnippetPart::getAllLanguages()
{
KTrader::OfferList languageSupportOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
- TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+ TQString::fromLatin1("[X-KDevelop-Version] == %1"
).tqarg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages;
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 8b7796e8..70dca46e 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -526,7 +526,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
if (!item)
return;
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if (r.isValid() &&
_SnippetConfig.useToolTips() )
@@ -681,7 +681,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
TQCheckBox * cb = NULL;
labTop = new TQLabel( &dlg, "label" );
- labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
labTop->sizePolicy().hasHeightForWidth() ) );
labTop->setText(i18n("Enter the replacement values for these variables:"));
layoutTop->addWidget(labTop, 0, 0);
@@ -720,14 +720,14 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
- btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn1->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn1, 0, 0 );
KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
btn2->setText(i18n("&Apply"));
btn2->setDefault( TRUE );
- btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn2->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn2, 0, 1 );
@@ -920,7 +920,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
group = dynamic_cast<SnippetGroup *>(item2->parent());
TQCString dropped;
- TQByteArray data = e->tqencodedData("text/plain");
+ TQByteArray data = e->encodedData("text/plain");
if ( e->provides("text/plain") && data.size()>0 ) {
//get the data from the event...
TQString encData(data.data());
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index 55bd67ad..e7665011 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index f5c56b99..e28d6ab7 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -144,7 +144,7 @@
<property name="name">
<cstring>leDelimiter</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index 78363581..a1a6157e 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -123,7 +123,7 @@ executed.&lt;/p&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 7db56d91..2e0a988a 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -104,7 +104,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
{
if (directory)
- return TQString::tqfromLatin1(" ") + text(column).upper();
+ return TQString::fromLatin1(" ") + text(column).upper();
else
return text(column).upper();
}
@@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
{
- setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent));
+ setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent));
KListView::resizeEvent(e);
}
diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui
index cd4a7e6f..67f9b7b5 100644
--- a/parts/tools/toolsconfigwidgetbase.ui
+++ b/parts/tools/toolsconfigwidgetbase.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 727215ba..302daf47 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
index ae87176c..03bf9c47 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
+++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>131</height>
diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui
index f253e41a..42502e58 100644
--- a/src/generalinfowidgetbase.ui
+++ b/src/generalinfowidgetbase.ui
@@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>408</width>
<height>20</height>
@@ -103,7 +103,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>32767</height>
@@ -145,13 +145,13 @@ Placed in the AUTHORS file</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index fcf3414c..0f31d40e 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -79,7 +79,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
config->setGroup("TerminalEmulator");
- gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole") ) );
+ gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
bool useKDESetting = config->readBoolEntry( "UseKDESetting", true );
gsw->useKDETerminal->setChecked( useKDESetting );
gsw->useOtherTerminal->setChecked( !useKDESetting );
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index eb77fc44..af093b78 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -67,7 +67,7 @@ void LanguageSelectWidget::init()
groupBox1->tqlayout()->setSpacing( 6 );
groupBox1->tqlayout()->setMargin( 11 );
TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
- groupBox1Layout->tqsetAlignment( TQt::AlignTop );
+ groupBox1Layout->setAlignment( TQt::AlignTop );
_currentLanguage = new TQLabel( "", groupBox1 );
@@ -85,10 +85,10 @@ void LanguageSelectWidget::init()
groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->tqlayout()->setMargin( 11 );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
- groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+ groupBox2Layout->setAlignment( TQt::AlignTop );
_pluginDescription = new TQLabel( groupBox2 );
- _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( _pluginDescription );
@@ -106,8 +106,8 @@ LanguageSelectWidget::~LanguageSelectWidget()
void LanguageSelectWidget::readProjectConfig()
{
KTrader::OfferList languageSupportOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
- TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+ TQString::fromLatin1("[X-KDevelop-Version] == %1"
).tqarg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui
index 87b92349..f5c436f4 100644
--- a/src/mimewarningdialog.ui
+++ b/src/mimewarningdialog.ui
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>24</width>
<height>20</height>
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 3b483cd4..23406486 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
setToggleButton(true);
setFocusPolicy(TQ_NoFocus);
setDescription(m_description);
- tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
- resize(tqsizeHint());
+ setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ resize(sizeHint());
fixDimensions(Ideal::Bottom);
TQToolTip::add(this, m_realText);
@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
pm.fill(eraseColor());
TQPainter p2(&pm);
- tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
+ tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
- tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+ tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
TQRect(0,0,pm.width(),pm.height()),
- tqcolorGroup(), flags, TQStyleOption());
+ colorGroup(), flags, TQStyleOption());
switch (m_place)
{
@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
{
setFixedWidth(height());
- setMinimumHeight(tqsizeHint().width());
+ setMinimumHeight(sizeHint().width());
setMaximumHeight(32767);
}
break;
@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
{
setFixedHeight(width());
- setMinimumWidth(tqsizeHint().height());
+ setMinimumWidth(sizeHint().height());
setMaximumWidth(32767);
}
break;
}
}
-TQSize Button::tqsizeHint() const
+TQSize Button::sizeHint() const
{
- return tqsizeHint(text());
+ return sizeHint(text());
}
-TQSize Button::tqsizeHint(const TQString &text) const
+TQSize Button::sizeHint(const TQString &text) const
{
constPolish();
int w = 0, h = 0;
@@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
h = TQMAX( h, ih );
}
if ( isMenuButton() )
- w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
w += pm->width();
@@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
TQString s( text );
bool empty = s.isEmpty();
if ( empty )
- s = TQString::tqfromLatin1("XXXX");
+ s = TQString::fromLatin1("XXXX");
TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w)
@@ -239,12 +239,12 @@ void Button::updateSize()
{
case Ideal::Left:
case Ideal::Right:
- setMinimumHeight(tqsizeHint().width());
- resize(tqsizeHint().height(), tqsizeHint().width());
+ setMinimumHeight(sizeHint().width());
+ resize(sizeHint().height(), sizeHint().width());
break;
case Ideal::Top:
case Ideal::Bottom:
- resize(tqsizeHint().width(), tqsizeHint().height());
+ resize(sizeHint().width(), sizeHint().height());
break;
}
}
diff --git a/src/newui/button.h b/src/newui/button.h
index 34ce4e3a..96948267 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -54,8 +54,8 @@ public:
/**Sets the mode of a button.*/
void setMode(Ideal::ButtonMode mode);
- TQSize tqsizeHint() const;
- TQSize tqsizeHint(const TQString &text) const;
+ TQSize sizeHint() const;
+ TQSize sizeHint(const TQString &text) const;
/**Updates size of a widget. Used after squeezing button's text.*/
void updateSize();
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index ddd4249b..f64e0695 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
{
}
-TQSize ButtonLayout::tqminimumSize() const
+TQSize ButtonLayout::minimumSize() const
{
- TQSize size = TQBoxLayout::tqminimumSize();
+ TQSize size = TQBoxLayout::minimumSize();
if (!m_buttonBar->autoResize())
return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const
case Ideal::Bottom:
return TQSize(0,size.height());
}
- return TQBoxLayout::tqminimumSize();
+ return TQBoxLayout::minimumSize();
}
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
{
case Ideal::Left:
case Ideal::Right:
- setFixedWidth(tqsizeHint().width());
- setMinimumHeight(tqsizeHint().height());
+ setFixedWidth(sizeHint().width());
+ setMinimumHeight(sizeHint().height());
setMaximumHeight(32767);
break;
case Ideal::Top:
case Ideal::Bottom:
- setFixedHeight(tqsizeHint().height());
- setMinimumWidth(tqsizeHint().width());
+ setFixedHeight(sizeHint().height());
+ setMinimumWidth(sizeHint().width());
setMaximumWidth(32767);
break;
}
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
{
case Ideal::Left:
case Ideal::Right:
- preferredDimension = l->TQBoxLayout::tqminimumSize().height();
+ preferredDimension = l->TQBoxLayout::minimumSize().height();
actualDimension = size().height();
oldDimension = ev->oldSize().height();
break;
case Ideal::Top:
case Ideal::Bottom:
- preferredDimension = l->TQBoxLayout::tqminimumSize().width();
+ preferredDimension = l->TQBoxLayout::minimumSize().width();
actualDimension = size().width();
oldDimension = ev->oldSize().width();
break;
@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
int size = 0;
for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
{
- size += (*it)->tqsizeHint((*it)->realText()).width();
+ size += (*it)->sizeHint((*it)->realText()).width();
}
return size;
}
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index ce4ad23b..0da55ecd 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -34,12 +34,12 @@ class ButtonBar;
/**@short A tqlayout for a ButtonBar class.
-Overrides tqminimumSize method to allow shrinking button bar buttons.*/
+Overrides minimumSize method to allow shrinking button bar buttons.*/
class ButtonLayout: public TQBoxLayout{
public:
ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
private:
ButtonBar *m_buttonBar;
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 9ce444eb..a4685107 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -119,9 +119,9 @@ void DDockWindow::setVisible(bool v)
if (!m_visible)
{
if (m_position == DDockWindow::Bottom)
- setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
+ setFixedExtentHeight(m_internalLayout->sizeHint().height());
else
- setFixedExtentWidth(m_internalLayout->tqsizeHint().width());
+ setFixedExtentWidth(m_internalLayout->sizeHint().width());
emit hidden();
}
else
@@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
int size = 0;
if (m_position == DDockWindow::Bottom)
{
- size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height());
+ size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().height());
setFixedExtentHeight(size);
}
else
{
- size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width());
+ size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width());
setFixedExtentWidth(size);
}
}
@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
{
if (m_toggledButton)
{
- TQWidget *w = tqApp->tqfocusWidget();
+ TQWidget *w = tqApp->focusWidget();
if (!w)
return false;
TQWidget *toolWidget = m_widgets[m_toggledButton];
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 4c787886..abb4d0ef 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -184,7 +184,7 @@ DTabWidget *DMainWindow::splitVertical()
void DMainWindow::invalidateActiveTabWidget()
{
-/* TQWidget *focused = m_central->tqfocusWidget();
+/* TQWidget *focused = m_central->focusWidget();
kdDebug(9000) << "tqinvalidate: " << focused << endl;
if (focused == 0)
return;
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index 8b382fb7..26fd4a71 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/newui/docksplitter.cpp
@@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
w->hide();
}
- m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
+ m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
if (isRowEmpty(row))
{
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 65257b1f..368b4c62 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -694,7 +694,7 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
// Document object and our HTMLDocumentationPart
// connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged()));
- // Connect to the document's views newtqStatus() signal in order to keep track of the
+ // Connect to the document's views newStatus() signal in order to keep track of the
// modified-status of the document.
if (isTextEditor)
@@ -718,8 +718,8 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )),
API::getInstance()->languageSupport(),
TQT_SLOT(openSource(DesignerType, const TQString& )));
- connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)),
- this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int)));
+ connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)),
+ this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int)));
}
}
@@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
TQPtrListIterator<KTextEditor::View> it( list );
while ( it.current() )
{
- connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) );
+ connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) );
++it;
}
}
@@ -1511,14 +1511,14 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
return true;
}
-void PartController::slotNewDesignertqStatus(const TQString &formName, int status)
+void PartController::slotNewDesignerStatus(const TQString &formName, int status)
{
kdDebug(9000) << k_funcinfo << endl;
kdDebug(9000) << " formName: " << formName << ", status: " << status << endl;
emit documentChangedState( KURL::fromPathOrURL(formName), DocumentState(status) );
}
-void PartController::slotNewtqStatus( )
+void PartController::slotNewStatus( )
{
kdDebug(9000) << k_funcinfo << endl;
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 9e563914..c811df7a 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -141,8 +141,8 @@ private slots:
void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason );
void slotDocumentDirtyStepTwo( void * );
- void slotNewtqStatus();
- void slotNewDesignertqStatus(const TQString &formName, int status);
+ void slotNewStatus();
+ void slotNewDesignerStatus(const TQString &formName, int status);
void textChanged();
void gotoLastEditPos();
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 5ec5a72c..e730778b 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -79,10 +79,10 @@ PluginController *PluginController::getInstance()
PluginController::PluginController()
: KDevPluginController()
{
-/* m_defaultProfile = TQString::tqfromLatin1( "FullIDE" );
+/* m_defaultProfile = TQString::fromLatin1( "FullIDE" );
m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" +
KStandardDirs::kde_default( "data" ) +
- TQString::tqfromLatin1("/tdevelop/profiles/FullIDE");*/
+ TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
if( args->isSet("profile") ){
diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui
index 1f69a9ca..2cab503b 100644
--- a/src/pluginselectdialogbase.ui
+++ b/src/pluginselectdialogbase.ui
@@ -81,7 +81,7 @@
<property name="name">
<cstring>plugin_description_label</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>21</height>
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 99921768..9f383911 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -115,7 +115,7 @@ void ProfileEditor::refresh()
void ProfileEditor::refreshPropertyCombo()
{
- KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"));
+ KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"));
TQStringList props;
for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
{
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index d66c4e31..2a420299 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>142</height>
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -376,7 +376,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -401,7 +401,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index d21a6b58..d6be00f1 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -78,23 +78,23 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
if (!profile)
return KTrader::OfferList();
- TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+ TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
switch (offerType) {
case Global:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
break;
case Project:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
break;
case Core:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
break;
}
TQString constraint_add = "";
Profile::EntryList properties = profile->list(Profile::Properties);
int i = 0;
for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it)
- constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
+ constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
tqarg((i++)==0?"":"or").tqarg((*it).name);
if (!constraint_add.isEmpty())
constraint += " and ( " + constraint_add + " ) ";
@@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
<< " " << constraint << endl << endl << endl;*/
//END debug
- KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+ KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
TQStringList names;
/* Wrong, this is not what we want to do.
@@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
{
if (names.contains((*it).name))
continue;
- TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
- constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name);
- KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+ TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+ constraint += TQString::fromLatin1("and [Name] == '%1'").tqarg((*it).name);
+ KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
list += enable;
}
@@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
{
- TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+ TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
switch (offerType) {
case Global:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
break;
case Project:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
break;
case Core:
- constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+ constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
break;
}
- return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+ return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
}
void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index f7478e75..9694ff0d 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile()
API::getInstance()->projectDom()->save(stream, 2);
fout.close();
} else {
- KTempFile fout(TQString::tqfromLatin1("tdevelop3"));
+ KTempFile fout(TQString::fromLatin1("tdevelop3"));
fout.setAutoDelete(true);
if (fout.status() != 0) {
KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
@@ -536,8 +536,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
}
KTrader::OfferList languageSupportOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
- TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION));
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+ TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION));
if (languageSupportOffers.isEmpty()) {
KMessageBox::sorry(TopLevel::getInstance()->main(),
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index 92d4554e..3db79b51 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -232,7 +232,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>60</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -350,7 +350,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -459,7 +459,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>150</height>
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index b730d55a..31ec4f55 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -36,7 +36,7 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
_status = new TQLabel( this );
_status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX OVR NORM * "));
- _status->tqsetAlignment(TQWidget::AlignCenter);
+ _status->setAlignment(TQWidget::AlignCenter);
addWidget(_status, 0, true);
connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
@@ -61,7 +61,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part)
if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget())))
{
connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
- this, TQT_SLOT( settqStatus( const TQString & ) ) );
+ this, TQT_SLOT( setStatus( const TQString & ) ) );
_status->show();
}
@@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged()
}
}
-void KDevStatusBar::settqStatus(const TQString &str)
+void KDevStatusBar::setStatus(const TQString &str)
{
_status->setText(str);
}
@@ -105,8 +105,8 @@ void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
{
KStatusBar::addWidget(widget,stretch,permanent);
- if(widget->tqsizeHint().height() + 4 > height())
- setFixedHeight(widget->tqsizeHint().height() + 4);
+ if(widget->sizeHint().height() + 4 > height())
+ setFixedHeight(widget->sizeHint().height() + 4);
}
#include "statusbar.moc"
diff --git a/src/statusbar.h b/src/statusbar.h
index c17392e8..a17ef3a9 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -22,7 +22,7 @@ namespace KTextEditor { class ViewCursorInterface; }
namespace KParts { class Part; }
/**
-tqStatus bar.
+Status bar.
*/
class KDevStatusBar : public KStatusBar
{
@@ -37,7 +37,7 @@ public:
private slots:
void cursorPositionChanged();
void activePartChanged(KParts::Part *part);
- void settqStatus(const TQString &str);
+ void setStatus(const TQString &str);
void setCursorPosition(int line, int col);
private:
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 33fb5302..5fe6dbf3 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath
return vcsInfo_;
}
-bool ClearcaseFileinfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath);
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index 292ada0f..85f60cc8 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -32,7 +32,7 @@ public:
const VCSFileInfoMap *status( const TQString &dirPath ) ;
// -- Async interface for requesting data
- bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
private:
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index 5355b3f0..a7f90ff7 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -28,7 +28,7 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
- messagelabel->setMinimumSize(messagelabel->tqsizeHint());
+ messagelabel->setMinimumSize(messagelabel->sizeHint());
tqlayout->addWidget(messagelabel, 0);
_edit = new TQMultiLineEdit(this);
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index c8b7100c..35182376 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -34,7 +34,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>437</height>
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 597415f1..bd8014d8 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date,
}
-TQSize AnnotateView::tqsizeHint() const
+TQSize AnnotateView::sizeHint() const
{
TQFontMetrics fm(fontMetrics());
return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing());
@@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p )
return;
}
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
//get the dimension of the author + the date column
TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn));
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index 956c0251..7586616e 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -42,7 +42,7 @@ public:
void addLine(TQString rev, TQString author, TQDateTime date, TQString content,
TQString comment, bool odd);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
void maybeTip( const TQPoint & p );
private:
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 18deee0f..1e676f43 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry()
authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress );
authorName = emailConfig.getSetting( KEMailSettings::RealName );
- TQDate currDate = TQDate::tqcurrentDate();
+ TQDate currDate = TQDate::currentDate();
date = currDate.toString( "yyyy-MM-dd" );
}
diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui
index 0639364d..06172a80 100644
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>156</width>
<height>20</height>
@@ -254,7 +254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>421</width>
<height>20</height>
diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui
index eabd9c57..d11b0b70 100644
--- a/vcs/cvsservice/commitdialogbase.ui
+++ b/vcs/cvsservice/commitdialogbase.ui
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>20</height>
diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index c9e9ab51..40d85b47 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const
bool CVSDir::isRegistered( const TQString fileName ) const
{
- CVSEntry entry = filetqStatus( fileName );
+ CVSEntry entry = fileStatus( fileName );
return entry.isValid() && entry.fileName() == fileName;
}
@@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const
///////////////////////////////////////////////////////////////////////////////
-CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
{
if (refreshCache)
refreshEntriesCache();
@@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName )
///////////////////////////////////////////////////////////////////////////////
-VCSFileInfoMap CVSDir::dirtqStatus() const
+VCSFileInfoMap CVSDir::dirStatus() const
{
VCSFileInfoMap vcsInfo;
/// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
for ( ; it != end; ++it)
{
const TQString &fileName = (*it);
- const CVSEntry entry = filetqStatus( fileName );
+ const CVSEntry entry = fileStatus( fileName );
vcsInfo.insert( fileName, entry.toVCSFileInfo() );
}
@@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
///////////////////////////////////////////////////////////////////////////////
-VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
+VCSFileInfoMap *CVSDir::cacheableDirStatus() const
{
VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
/// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
for ( ; it != end; ++it)
{
const TQString &fileName = (*it);
- const CVSEntry entry = filetqStatus( fileName );
+ const CVSEntry entry = fileStatus( fileName );
vcsInfo->insert( fileName, entry.toVCSFileInfo() );
}
diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h
index dc7cb53a..1d3f7d85 100644
--- a/vcs/cvsservice/cvsdir.h
+++ b/vcs/cvsservice/cvsdir.h
@@ -46,11 +46,11 @@ public:
* @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries"
* @return an empty CVSEntry if the file is not present
*/
- CVSEntry filetqStatus( const TQString &fileName, bool refreshCache = false ) const;
+ CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const;
/**
*/
- VCSFileInfoMap dirtqStatus() const;
- VCSFileInfoMap *cacheableDirtqStatus() const;
+ VCSFileInfoMap dirStatus() const;
+ VCSFileInfoMap *cacheableDirStatus() const;
/**
* @return true if the file is registered into repository, false otherwise
*/
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 2ed764f4..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
delete m_cachedDirEntries;
CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
m_previousDirPath = dirPath;
- m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
+ m_cachedDirEntries = cvsdir.cacheableDirStatus();
}
return m_cachedDirEntries;
}
///////////////////////////////////////////////////////////////////////////////
-bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
{
m_savedCallerData = callerData;
if (m_requestStatusJob)
@@ -131,11 +131,11 @@ void CVSFileInfoProvider::propagateUpdate()
void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
{
- m_cachedDirEntries = dir.cacheableDirtqStatus();
+ m_cachedDirEntries = dir.cacheableDirStatus();
printOutFileInfoMap( *m_cachedDirEntries );
- /* FileTree will call requesttqStatus() everytime the user expands a directory
- * Unfortunatly requesttqStatus() will be called before the
+ /* FileTree will call requestStatus() everytime the user expands a directory
+ * Unfortunatly requestStatus() will be called before the
* VCSFileTreeViewItem of the directory will be filled with the files
* it contains. Meaning, m_savedCallerData contains no childs at that
* time. When a dcop call is made to run "cvs status" this is no problem.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
TQRegExp rx_recordStart( "^=+$" );
TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
- TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" );
+ TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
//TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
@@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
//TQRegExp rx_stickyOptions( "" ); //@todo
TQString fileName,
- filetqStatus,
+ fileStatus,
workingRevision,
repositoryRevision,
stickyTag,
@@ -224,12 +224,12 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
if (rx_recordStart.exactMatch( s ))
state = 1;
- else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName
+ else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0) // FileName
{
fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
- filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+ fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
++state; // Next state
- kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
+ kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
}
else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
{
@@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
// Package stuff, put into map and get ready for a new record
VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision,
- String2EnumState( filetqStatus ) );
+ String2EnumState( fileStatus ) );
kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
vcsStates->insert( fileName, vcsInfo );
}
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index ead2d113..0a3d8887 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -40,7 +40,7 @@ public:
virtual const VCSFileInfoMap *status( const TQString &dirPath ) ;
// -- Async interface for requesting data
- virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
public slots:
void updateStatusFor( const CVSDir& );
diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui
index 62abbfd5..875bac49 100644
--- a/vcs/cvsservice/cvsformbase.ui
+++ b/vcs/cvsservice/cvsformbase.ui
@@ -197,7 +197,7 @@ Most of the thime you'll just reuse the project name</string>
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 6f2894e6..43add3be 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -24,9 +24,9 @@
// Macros
///////////////////////////////////////////////////////////////////////////////
-#define default_revert TQString::tqfromLatin1("-C")
-#define default_diff TQString::tqfromLatin1("-p")
-#define default_rsh TQString::tqfromLatin1("")
+#define default_revert TQString::fromLatin1("-C")
+#define default_diff TQString::fromLatin1("-p")
+#define default_rsh TQString::fromLatin1("")
#define default_contextLines 3
#define default_compression 0
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index bca0d2f2..9df91a9b 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -321,45 +321,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context )
popup->insertSeparator();
int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
// CvsService let to do log and diff operations only on one file (or directory) at time
if (m_urls.count() == 1)
{
id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
+ subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
+ subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
+ subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
}
id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
+ subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
+ subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
+ subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
subMenu->insertSeparator();
id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
+ subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
subMenu->insertSeparator();
id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
+ subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
+ subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
// Now insert in parent menu
popup->insertItem( i18n("CvsService"), subMenu );
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index b8b1685d..7556f7bc 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -211,7 +211,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirect
kdDebug(9006) << k_funcinfo << " Error: " << cvsdir.path() << " is not a valid CVS directory " << endl;
return false;
}
- CVSEntry entry = cvsdir.filetqStatus( url.fileName() );
+ CVSEntry entry = cvsdir.fileStatus( url.fileName() );
return entry.isValid();
}
}
@@ -639,7 +639,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
return;
CVSDir cvsdir = CVSDir( urlList[0].directory() );
- CVSEntry entry = cvsdir.filetqStatus( urlList[0].fileName() );
+ CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() );
DiffDialog dlg(entry);
if (dlg.exec() != TQDialog::Accepted)
diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui
index b4995cb4..6e79b54a 100644
--- a/vcs/cvsservice/diffdialogbase.ui
+++ b/vcs/cvsservice/diffdialogbase.ui
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui
index 933d477f..37af7c1b 100644
--- a/vcs/cvsservice/editorsdialogbase.ui
+++ b/vcs/cvsservice/editorsdialogbase.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui
index 398af4cf..9028b325 100644
--- a/vcs/cvsservice/integrator/fetcherdlgbase.ui
+++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui
index 6e5b76f1..82e26c55 100644
--- a/vcs/cvsservice/integrator/initdlg.ui
+++ b/vcs/cvsservice/integrator/initdlg.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui
index 8e7cc979..150ac9bc 100644
--- a/vcs/cvsservice/integrator/integratordlgbase.ui
+++ b/vcs/cvsservice/integrator/integratordlgbase.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui
index dbc59f7e..559d7be7 100644
--- a/vcs/cvsservice/releaseinputdialogbase.ui
+++ b/vcs/cvsservice/releaseinputdialogbase.ui
@@ -174,7 +174,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui
index 2ac067b3..b4b9ecce 100644
--- a/vcs/cvsservice/tagdialogbase.ui
+++ b/vcs/cvsservice/tagdialogbase.ui
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui
index 8d1c3530..f798e42a 100644
--- a/vcs/perforce/integrator/pfintegratordlgbase.ui
+++ b/vcs/perforce/integrator/pfintegratordlgbase.ui
@@ -34,7 +34,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>435</height>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index ca81a8d4..692e10db 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -98,26 +98,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
int id = sub->insertItem( i18n("Edit"),
this, TQT_SLOT(slotEdit()) );
- sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+ sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
id = sub->insertItem( i18n("Revert"),
this, TQT_SLOT(slotRevert()) );
- sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+ sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
id = sub->insertItem( i18n("Submit"),
this, TQT_SLOT(slotCommit()) );
- sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+ sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
id = sub->insertItem( i18n("Sync"),
this, TQT_SLOT(slotUpdate()) );
- sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+ sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
sub->insertSeparator();
id = sub->insertItem( i18n("Diff Against Repository"),
this, TQT_SLOT(slotDiff()) );
- sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+ sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
id = sub->insertItem( i18n("Add to Repository"),
this, TQT_SLOT(slotAdd()) );
- sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+ sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
id = sub->insertItem( i18n("Remove From Repository"),
this, TQT_SLOT(slotRemove()) );
- sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+ sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
id = popup->insertItem(i18n("Perforce"), sub);
}
}
diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui
index d557aa91..d472c8f1 100644
--- a/vcs/subversion/commitdlgbase.ui
+++ b/vcs/subversion/commitdlgbase.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index 52ce91a5..700b3edb 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>131</height>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index c5c341a5..5e2ec8d9 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -239,7 +239,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// return false;
// }
//
-// int KSvnd::gettqStatus( const KURL::List& list ) {
+// int KSvnd::getStatus( const KURL::List& list ) {
// int result = 0;
// uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
// for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
//
// TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// TQStringList result;
-// int listtqStatus = gettqStatus( list );
+// int listStatus = getStatus( list );
//
-// if ( !(listtqStatus & SomeAreInParentsEntries) &&
-// !(listtqStatus & SomeAreExternalToParent) &&
-// !(listtqStatus & SomeHaveSvn)) {
-// if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// if ( !(listStatus & SomeAreInParentsEntries) &&
+// !(listStatus & SomeAreExternalToParent) &&
+// !(listStatus & SomeHaveSvn)) {
+// if( list.size() == 1 && listStatus & SomeAreFolders) {
// result << "Checkout";
// result << "Export";
// // result << "CreateRepository";
// result << "Import";
// }
-// } else if ( (listtqStatus & AllAreInParentsEntries) ) {
+// } else if ( (listStatus & AllAreInParentsEntries) ) {
// result << "Diff";
// //In SVN
// // result << "ShowLog";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// // result << "Update to revision..."
// result << "Rename";
// result << "Delete";
-// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// result << "Revert";
// // result << "Cleanup";
// }
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// // result << "BranchTag";
// result << "Switch";
// result << "Merge";
-// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// // result << "Export";
// // result << "Relocate";
// result << "_SEPARATOR_";
// result << "Add";
// }
// result << "_SEPARATOR_";
-// if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+// if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
// result << "Blame";
// }
// result << "CreatePatch";
//
-// if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// if( list.size() == 1 && listStatus & SomeAreFolders) {
// // result << "ApplyPatchToFolder";
// }
// }
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
//
// TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
// TQStringList result;
-// int listtqStatus = gettqStatus( list );
+// int listStatus = getStatus( list );
//
//
-// if ( ( listtqStatus & AllParentsHaveSvn &&
-// ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
-// || ( listtqStatus & SomeHaveSvn ) )
+// if ( ( listStatus & AllParentsHaveSvn &&
+// ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+// || ( listStatus & SomeHaveSvn ) )
// ) {
// result << "Update";
// result << "Commit";
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 8ea4e4d5..be0a4411 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
curIdx = rx.cap( 1 ).toInt();
}
- slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+ slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
}
}
kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl;
return m_cachedDirEntries;
}
-bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
kdDebug(9036) << "##################################################################################### svn provider : request status" << endl;
m_savedCallerData = callerData;
// Flush old cache
@@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
curIdx = rx.cap( 1 ).toInt();
}
- slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+ slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
}
if ( m_cachedDirEntries )
emit statusReady(*m_cachedDirEntries, m_savedCallerData);
}
-void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
+void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
// kdDebug(9036) << "##################################################################################### svn provider : slotstatus"
// << " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status
// << " repos_prop_status " << repos_prop_status << " rev " << rev
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index dc1bfe1e..4729c35b 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -51,12 +51,12 @@ public:
void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
// -- Async interface for requesting data
- virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+ virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
TQString projectDirectory() const;
k_dcop:
- void slottqStatus( const TQString& , int, int, int, int, long int ) ;
+ void slotStatus( const TQString& , int, int, int, int, long int ) ;
public slots:
void slotResult( KIO::Job * );
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index a98f2298..af58f7c8 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -220,42 +220,42 @@ if(!project())
subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
}*/
- subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
+ subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
+ subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
subMenu->insertSeparator();
id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
+ subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
+ subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
+ subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
+ subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
+ subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
+ subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
+ subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
/*
subMenu->insertSeparator();
id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
- subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
+ subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
*/
// Now insert in parent menu
popup->insertItem( i18n("Subversion"), subMenu );
diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/vcs/subversion/subversiondiff.ui
+++ b/vcs/subversion/subversiondiff.ui
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui
index 73bc66b5..64bd3ed6 100644
--- a/vcs/subversion/svn_co.ui
+++ b/vcs/subversion/svn_co.ui
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui
index d6ebee02..ea572fc6 100644
--- a/vcs/subversion/svn_commitdlgbase.ui
+++ b/vcs/subversion/svn_commitdlgbase.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>335</width>
<height>30</height>
diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui
index 4361afe2..e874206a 100644
--- a/vcs/subversion/svn_copydlgwidget.ui
+++ b/vcs/subversion/svn_copydlgwidget.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>31</height>
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 25149483..0c014a9d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
vcsInfo = it.data();
// TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
- KURL urlFromtqStatus( absPathStr );
+ KURL urlFromStatus( absPathStr );
if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
- this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus );
+ this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus );
-// tobeCommittedUrls.push_back( urlFromtqStatus );
-// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl;
+// tobeCommittedUrls.push_back( urlFromStatus );
+// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl;
}
else{
- kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl;
+ kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl;
}
}
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 541d1674..eaed9c12 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
listView1->addColumn( i18n( "Date" ) );
listView1->addColumn( i18n( "Author" ) );
listView1->addColumn( i18n( "Comment" ) );
- listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+ listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
TQFont listView1_font( listView1->font() );
listView1_font.setPointSize( 9 );
listView1->setFont( listView1_font );
@@ -60,7 +60,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
listView1->setShowSortIndicator( TRUE );
textEdit1 = new KTextEdit( splitter1, "textEdit1" );
- textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+ textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
TQFont textEdit1_font( textEdit1->font() );
textEdit1_font.setPointSize( 9 );
textEdit1->setFont( textEdit1_font );
@@ -70,7 +70,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
m_layout->addWidget( splitter1, 0, 0 );
m_layout->setMargin(1);
- resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index d42a2707..b54ead45 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>171</width>
<height>31</height>
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index 3c640661..af1d5898 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>30</height>